SHA256
1
0
forked from pool/rpmlint

fix hunk being applied incorrectly

OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=134
This commit is contained in:
Dirk Mueller 2012-09-13 16:07:20 +00:00 committed by Git OBS Bridge
parent 3073721c60
commit 202a2696c3

View File

@ -69,10 +69,10 @@ Index: Pkg.py
self._gather_aux(self.header, self._requires, self._gather_aux(self.header, self._requires,
rpm.RPMTAG_REQUIRENAME, rpm.RPMTAG_REQUIRENAME,
@@ -761,6 +789,32 @@ class Pkg: @@ -748,6 +776,28 @@ class Pkg:
prog = " ".join(prog) rpm.RPMTAG_OBSOLETENAME,
return prog rpm.RPMTAG_OBSOLETEFLAGS,
rpm.RPMTAG_OBSOLETEVERSION)
+ try: + try:
+ self._gather_aux(self.header, self._recommends, + self._gather_aux(self.header, self._recommends,
+ rpm.RPMTAG_SUGGESTSNAME, + rpm.RPMTAG_SUGGESTSNAME,
@ -95,6 +95,13 @@ Index: Pkg.py
+ rpm.RPMTAG_ENHANCESVERSION, + rpm.RPMTAG_ENHANCESVERSION,
+ weak_only=True) + weak_only=True)
+ +
def scriptprog(self, which):
"""Get the specified script interpreter as a string.
@@ -761,6 +811,10 @@ class Pkg:
prog = " ".join(prog)
return prog
+ except: + except:
+ pass + pass
+ +