From 1b89f7fa22a1c915f20b08beb70396edfb797ec9 Mon Sep 17 00:00:00 2001 From: "Adam D. Barratt" Date: Sat, 7 Sep 2013 18:19:17 +0000 Subject: [PATCH] Rename make_hintitem() to make_migrationitem() Signed-off-by: Adam D. Barratt --- britney.py | 10 +++++----- britney_util.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/britney.py b/britney.py index 53a4fba..c7d4e66 100755 --- a/britney.py +++ b/britney.py @@ -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. diff --git a/britney_util.py b/britney_util.py index 5d1c913..672bbfa 100644 --- a/britney_util.py +++ b/britney_util.py @@ -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