From 73db8c6b8e18a7cb4c366a92f8f09a0a2d5c783f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bahad=C4=B1r=20Kandemir?= Date: Fri, 4 Dec 2009 11:55:25 +0000 Subject: [PATCH] Reverted AnyDep changes --- ChangeLog | 3 +++ pisi/scenarioapi/pspec.py | 16 ++++------------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index befb82fa..34804876 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2009-12-04 Bahadır Kandemir + * pisi/scenarioapi/pspec.py: Reverted AnyDependency changes. + 2009-12-04 Bahadır Kandemir * pisi/scenarioapi/package.py: Fixed repo_version_bumped() ignoring with_version() argument. diff --git a/pisi/scenarioapi/pspec.py b/pisi/scenarioapi/pspec.py index 06089eef..65b7919f 100644 --- a/pisi/scenarioapi/pspec.py +++ b/pisi/scenarioapi/pspec.py @@ -140,18 +140,10 @@ class Pspec: self.package.conflicts = conflicts if dependencies: - for depitem in dependencies: - if isinstance(depitem, list): - anydep = AnyDependency() - for depname in depitem: - dep = Dependency() - dep.package = depname - anydep.dependencies.append(dep) - self.package.packageAnyDependencies.append(anydep) - else: - dep = Dependency() - dep.package = depitem - self.package.packageDependencies.append(dep) + for depname in dependencies: + dep = Dependency() + dep.package = depname + self.package.packageDependencies.append(dep) self.pspec.packages.append(self.package)