From cf7782696946d0b68e56793f5e1b9ecd1b3cd47e Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Sun, 20 Aug 2006 16:13:53 +0000 Subject: [PATCH] * ick! --- pisi/scenarioapi/package.py | 6 ------ pisi/scenarioapi/repoops.py | 7 +------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/pisi/scenarioapi/package.py b/pisi/scenarioapi/package.py index 98f903c5..df27cfaf 100644 --- a/pisi/scenarioapi/package.py +++ b/pisi/scenarioapi/package.py @@ -64,12 +64,6 @@ class Package: def version_bump(self, *args): if args: - - if type(args[0]) == tuple: - withs = args[0] - else: - withs = args - for with in withs: if with.types == CONFLICT and with.action == ADDED: self.pspec.add_conflicts(with.pkgs) diff --git a/pisi/scenarioapi/repoops.py b/pisi/scenarioapi/repoops.py index 7f196e3c..056ea253 100644 --- a/pisi/scenarioapi/repoops.py +++ b/pisi/scenarioapi/repoops.py @@ -53,12 +53,7 @@ def repo_version_bumped(package, *args): raise Exception(_("Repo does not have package named %s.") % package) old_file = repodb[package].get_file_name() - - if args: - repodb[package].version_bump(args) - else: - repodb[package].version_bump() - + repodb[package].version_bump(*args) os.unlink(os.path.join(consts.repo_path, old_file)) def repo_updated_index():