* fix: duplicate packages in order_inst

This commit is contained in:
Eray Özkural
2006-03-09 09:07:36 +00:00
parent 4acb86f456
commit 61e7bfdf1e
2 changed files with 18 additions and 20 deletions
+7 -9
View File
@@ -52,7 +52,8 @@ class CLI(UI):
def close(self): def close(self):
util.xterm_title_reset() util.xterm_title_reset()
def output(self, msg, err = False): def output(self, msg, err = False, verbose = False):
if (verbose and self.show_verbose) or (not verbose):
if type(msg)==type(unicode()): if type(msg)==type(unicode()):
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
if err: if err:
@@ -69,16 +70,13 @@ class CLI(UI):
msgend = '' msgend = ''
else: else:
msgend = '\n' msgend = '\n'
if verbose and self.show_verbose: self.output(msg + msgend, verbose=verbose)
self.output(msg + msgend)
elif not verbose:
self.output(msg + msgend)
def warning(self,msg): def warning(self, msg, verbose = False):
if ctx.get_option('no_color'): if ctx.get_option('no_color'):
self.output(_('Warning: ') + msg + '\n', err=True) self.output(_('Warning: ') + msg + '\n', err=True, verbose=verbose)
else: else:
self.output(colorize(msg + '\n', 'purple'), err=True) self.output(colorize(msg + '\n', 'purple'), err=True, verbose=verbose)
def error(self, msg): def error(self, msg):
if ctx.get_option('no_color'): if ctx.get_option('no_color'):
@@ -86,7 +84,7 @@ class CLI(UI):
else: else:
self.output(colorize(msg + '\n', 'red'), err=True) self.output(colorize(msg + '\n', 'red'), err=True)
def action(self,msg): def action(self, msg, verbose = False):
#TODO: this seems quite redundant? #TODO: this seems quite redundant?
self.output(colorize(msg + '\n', 'green')) self.output(colorize(msg + '\n', 'green'))
+2 -2
View File
@@ -646,7 +646,7 @@ def plan_emerge(A, rebuild_all):
#pkgtosrc = {} #pkgtosrc = {}
B = A B = A
install_list = [] install_list = set()
while len(B) > 0: while len(B) > 0:
Bp = set() Bp = set()
@@ -660,7 +660,7 @@ def plan_emerge(A, rebuild_all):
def process_dep(dep): def process_dep(dep):
if not dependency.installed_satisfies_dep(dep): if not dependency.installed_satisfies_dep(dep):
if dependency.repo_satisfies_dep(dep): if dependency.repo_satisfies_dep(dep):
install_list.append(dep.package) install_list.add(dep.package)
return return
srcdep = pkgtosrc(dep.package) srcdep = pkgtosrc(dep.package)
if not srcdep in G_f.vertices(): if not srcdep in G_f.vertices():