AnyDependency support added to with_dependencies() method. Simply give AnyDependency list as an argument.
This commit is contained in:
@@ -1,3 +1,8 @@
|
|||||||
|
2009-12-04 Bahadır Kandemir <bahadir@pardus.org.tr>
|
||||||
|
* pisi/scenarioapi/pspec.py: AnyDependency support added to
|
||||||
|
with_dependencies() method. Simply give AnyDependency list as an
|
||||||
|
argument.
|
||||||
|
|
||||||
2009-11-22 Bahadır Kandemir <bahadir@pardus.org.tr>
|
2009-11-22 Bahadır Kandemir <bahadir@pardus.org.tr>
|
||||||
* pisi/operations/build.py, pisi/index.py: *Size variables should be
|
* pisi/operations/build.py, pisi/index.py: *Size variables should be
|
||||||
long, instead of int.
|
long, instead of int.
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
# Please read the COPYING file.
|
# Please read the COPYING file.
|
||||||
#
|
#
|
||||||
|
|
||||||
from pisi.specfile import SpecFile, Package, Update, Path, Action
|
from pisi.specfile import SpecFile, Package, Update, Path, Action, AnyDependency
|
||||||
from pisi.dependency import Dependency
|
from pisi.dependency import Dependency
|
||||||
from pisi.conflict import Conflict
|
from pisi.conflict import Conflict
|
||||||
from pisi.pxml.autoxml import LocalText
|
from pisi.pxml.autoxml import LocalText
|
||||||
@@ -140,10 +140,18 @@ class Pspec:
|
|||||||
self.package.conflicts = conflicts
|
self.package.conflicts = conflicts
|
||||||
|
|
||||||
if dependencies:
|
if dependencies:
|
||||||
for depname in dependencies:
|
for depitem in dependencies:
|
||||||
dep = Dependency()
|
if isinstance(depitem, list):
|
||||||
dep.package = depname
|
anydep = AnyDependency()
|
||||||
self.package.packageDependencies.append(dep)
|
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)
|
||||||
|
|
||||||
self.pspec.packages.append(self.package)
|
self.pspec.packages.append(self.package)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user