scenarioapi/pspec: Properly add conflicts
This commit is contained in:
@@ -140,7 +140,6 @@ class Pspec:
|
|||||||
|
|
||||||
def set_package(self, dependencies, conflicts):
|
def set_package(self, dependencies, conflicts):
|
||||||
self.package.name = self.name
|
self.package.name = self.name
|
||||||
self.package.conflicts = conflicts
|
|
||||||
|
|
||||||
if dependencies:
|
if dependencies:
|
||||||
for depname in dependencies:
|
for depname in dependencies:
|
||||||
@@ -148,6 +147,12 @@ class Pspec:
|
|||||||
dep.package = depname
|
dep.package = depname
|
||||||
self.package.packageDependencies.append(dep)
|
self.package.packageDependencies.append(dep)
|
||||||
|
|
||||||
|
if conflicts:
|
||||||
|
for package in conflicts:
|
||||||
|
conflict = Conflict()
|
||||||
|
conflict.package = package
|
||||||
|
self.package.conflicts.append(conflict)
|
||||||
|
|
||||||
self.pspec.packages.append(self.package)
|
self.pspec.packages.append(self.package)
|
||||||
|
|
||||||
def set_history(self, date, version, comment = "No Comment", release = "1"):
|
def set_history(self, date, version, comment = "No Comment", release = "1"):
|
||||||
|
|||||||
Reference in New Issue
Block a user