Reverted AnyDep changes
This commit is contained in:
@@ -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>
|
2009-12-04 Bahadır Kandemir <bahadir@pardus.org.tr>
|
||||||
* pisi/scenarioapi/package.py: Fixed repo_version_bumped() ignoring
|
* pisi/scenarioapi/package.py: Fixed repo_version_bumped() ignoring
|
||||||
with_version() argument.
|
with_version() argument.
|
||||||
|
|||||||
@@ -140,18 +140,10 @@ class Pspec:
|
|||||||
self.package.conflicts = conflicts
|
self.package.conflicts = conflicts
|
||||||
|
|
||||||
if dependencies:
|
if dependencies:
|
||||||
for depitem in dependencies:
|
for depname in dependencies:
|
||||||
if isinstance(depitem, list):
|
dep = Dependency()
|
||||||
anydep = AnyDependency()
|
dep.package = depname
|
||||||
for depname in depitem:
|
self.package.packageDependencies.append(dep)
|
||||||
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)
|
|
||||||
|
|
||||||
self.pspec.packages.append(self.package)
|
self.pspec.packages.append(self.package)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user