Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-02-24 03:41:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename make_hintitem() to make_migrationitem()

Browse Source 
Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
This commit is contained in:
Adam D. Barratt 2013-09-07 18:19:17 +00:00
parent 77e8c656ff
commit 1b89f7fa22
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
britney.py
View File

@ -215,7 +215,7 @@ from britney import buildSystem
from britney_util import (old_libraries_format, same_source, undo_changes,
register_reverses, compute_reverse_tree,
read_nuninst, write_nuninst, write_heidi,
eval_uninst, newly_uninst, make_hintitem)
eval_uninst, newly_uninst, make_migrationitem)
from consts import (VERSION, SECTION, BINARIES, MAINTAINER, FAKESRC,
SOURCE, SOURCEVER, ARCHITECTURE, DEPENDS, CONFLICTS,
PROVIDES, RDEPENDS, RCONFLICTS)
@ -1573,7 +1573,7 @@ class Britney(object):
self.invalidate_excuses(upgrade_me, unconsidered)
# sort the list of candidates
self.upgrade_me = sorted( make_hintitem(x, self.sources) for x in upgrade_me )
self.upgrade_me = sorted( make_migrationitem(x, self.sources) for x in upgrade_me )
# write excuses to the output file
if not self.options.dry_run:
@ -2011,8 +2011,8 @@ class Britney(object):
defer = False
for p in dependencies.get(pkg, []):
if p in skipped:
deferred.append(make_hintitem(pkg, self.sources))
skipped.append(make_hintitem(pkg, self.sources))
deferred.append(make_migrationitem(pkg, self.sources))
skipped.append(make_migrationitem(pkg, self.sources))
defer = True
break
if defer: continue
@ -2451,7 +2451,7 @@ class Britney(object):
self.dependencies[e.name] = e.deps
# replace the list of actions with the new one
self.upgrade_me = [ make_hintitem(x, self.sources) for x in upgrade_me ]
self.upgrade_me = [ make_migrationitem(x, self.sources) for x in upgrade_me ]
def auto_hinter(self):
"""Auto-generate "easy" hints.

2
britney_util.py
View File

@ -361,7 +361,7 @@ def write_heidi(filename, sources_t, packages_t,
srcsec = src[SECTION] or 'unknown'
f.write('%s %s source %s\n' % (src_name, srcv, srcsec))
def make_hintitem(package, sources, VERSION=VERSION):
def make_migrationitem(package, sources, VERSION=VERSION):
"""Convert a textual package specification to a MigrationItem
sources is a list of source packages in each suite, used to determine