diff --git a/pisi.e3p b/pisi.e3p index d48d7e75..4d1ad2e7 100644 --- a/pisi.e3p +++ b/pisi.e3p @@ -1,7 +1,7 @@ - + Python @@ -348,6 +348,10 @@ tools ChangeLogGenerator.py + + pisi + oo.py + @@ -385,10 +389,10 @@ {'standardLayout': 1} - - - - + + + + diff --git a/pisi/api.py b/pisi/api.py index 7a7bf663..e691fc80 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -213,6 +213,8 @@ def install_pkg_names(A): the repository, trying to perform a minimum number of installs""" + A = set(A) # A was a list, remove duplicates + ctx.ui.debug('A = %s' % str(A)) if len(A)==0: @@ -324,7 +326,7 @@ def upgrade_pkg_names(A): ctx.ui.info(_('Package %s is already at its latest version %s,\ release %s, build %s.') % (x, pkg.version, pkg.release, pkg.build)) - A = Ap + A = set(Ap) if len(A)==0: ctx.ui.info(_('No packages to upgrade.')) @@ -407,7 +409,7 @@ def remove(A): Ap.append(x) else: ctx.ui.info(_('Package %s does not exist. Cannot remove.') % x) - A = Ap + A = set(Ap) if len(A)==0: ctx.ui.info(_('No packages to remove.')) diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index f1083d53..89bb56c4 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -545,8 +545,8 @@ Usage: list-installed package = pisi.packagedb.inst_packagedb.get_package(pkg) inst_info = ctx.installdb.get_info(pkg) if self.options.long: - ctx.ui.info(package) - ctx.ui.info(inst_info) + ctx.ui.info(str(package)) + ctx.ui.info(str(inst_info)) elif self.options.install_info: ctx.ui.info('%-15s | %s ' % (package.name, inst_info.one_liner())) else: