starlingx/integ
Code Issues Proposed changes

Fix fuzzy issue introduced by Change 597433

Browse Source 
One fuzzy issue introduced in
https://review.openstack.org/#/c/597433/
smart-recommends.patch line 1164
It will cause build issue!
Change patch error and build pass

Closes-Bug: 1801685

Change-Id: I31d23a6287f8eff53fa26c95914ed8b80a8ed7a9
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
This commit is contained in:
zhipengl 2018-11-06 01:56:04 +08:00
parent 4d6ad383ec
commit c4617d4c4b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
python/python-smartpm/centos/patches/smart-recommends.patch
View File

@ -1117,10 +1117,11 @@ index 808e53a..9265cd9 100644
parser.add_option("--show-upgrades", action="store_true", parser.add_option("--show-upgrades", action="store_true",
help=_("show upgrades for the given packages")) help=_("show upgrades for the given packages"))
parser.add_option("--show-conflicts", action="store_true", parser.add_option("--show-conflicts", action="store_true",
@@ -488,6 +490,19 @@ def main(ctrl, opts, reloadchannels=True): @@ -488,6 +490,21 @@ def main(ctrl, opts, reloadchannels=True):
continue continue
output.showRequiresProvidedBy(pkg, req, output.showRequiresProvidedBy(pkg, req,
prv, prvpkg) prv, prvpkg)
+
+ if pkg.recommends and (opts.show_recommends): + if pkg.recommends and (opts.show_recommends):
+ pkg.recommends.sort() + pkg.recommends.sort()
+ first = True + first = True
@ -1134,10 +1135,11 @@ index 808e53a..9265cd9 100644
+ continue + continue
+ output.showRecommendsProvidedBy(pkg, req, + output.showRecommendsProvidedBy(pkg, req,
+ prv, prvpkg) + prv, prvpkg)
+
if pkg.upgrades and (opts.show_upgrades or whoupgrades): if pkg.upgrades and (opts.show_upgrades or whoupgrades):
pkg.upgrades.sort() pkg.upgrades.sort()
first = True first = True
@@ -594,6 +609,12 @@ class NullOutput(object): @@ -594,6 +611,12 @@ class NullOutput(object):
def showRequiresProvidedBy(self, pkg, req, prv, prvpkg): def showRequiresProvidedBy(self, pkg, req, prv, prvpkg):
pass pass
@ -1150,7 +1152,7 @@ index 808e53a..9265cd9 100644
def showUpgrades(self, pkg, upg): def showUpgrades(self, pkg, upg):
pass pass
@@ -619,6 +640,8 @@ class TextOutput(NullOutput): @@ -619,6 +642,8 @@ class TextOutput(NullOutput):
self._firstconflictedby = True self._firstconflictedby = True
self._firstrequires = True self._firstrequires = True
self._firstrequiresprovidedby = True self._firstrequiresprovidedby = True
@ -1159,9 +1161,9 @@ index 808e53a..9265cd9 100644
self._firstupgrades = True self._firstupgrades = True
self._firstupgradesprovidedby = True self._firstupgradesprovidedby = True
self._firstconflicts = True self._firstconflicts = True
@@ -711,6 +734,22 @@ class TextOutput(NullOutput): @@ -711,6 +736,22 @@ class TextOutput(NullOutput):
name = str(prvpkg) name = str(prvpkg)
print(" ", "%s (%s)" % (name, prv)) print " ", "%s (%s)" % (name, prv)
+ def showRecommends(self, pkg, rec): + def showRecommends(self, pkg, rec):
+ if self._firstrecommends: + if self._firstrecommends:
@ -1182,7 +1184,7 @@ index 808e53a..9265cd9 100644
def showUpgrades(self, pkg, upg): def showUpgrades(self, pkg, upg):
if self._firstupgrades: if self._firstupgrades:
self._firstupgrades = False self._firstupgrades = False
@@ -797,6 +836,18 @@ class GraphVizOutput(NullOutput): @@ -797,6 +838,18 @@ class GraphVizOutput(NullOutput):
self._shown[req, prv] = True self._shown[req, prv] = True
print ' "Requires: %s" -> "Provides: %s";' % (req, prv) print ' "Requires: %s" -> "Provides: %s";' % (req, prv)