Reverted AnyDep changes

2009-12-04 11:55:25 +00:00
parent ffbd4526e5
commit 73db8c6b8e
2 changed files with 7 additions and 12 deletions
@@ -1,3 +1,6 @@
+2009-12-04 Bahadır Kandemir <bahadir@pardus.org.tr>
+		* pisi/scenarioapi/pspec.py: Reverted AnyDependency changes.
+
 2009-12-04 Bahadır Kandemir <bahadir@pardus.org.tr>
 		* pisi/scenarioapi/package.py: Fixed repo_version_bumped() ignoring
 		with_version() argument.
@@ -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)