Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conflicts ve provides ile derleme sorunu giderildi.

Browse Source 
specfile içerisindeki yorumlar eski haline getirildi.
This commit is contained in:
Barış Metin
2005-07-13 19:23:34 +00:00
parent 573e33dec8
commit 79628d3f8f
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/metadata.py
+2
View File
@@ -79,6 +79,8 @@ class MetaData(XmlFile):
self.package.runtimeDeps = pkg.runtimeDeps self.package.runtimeDeps = pkg.runtimeDeps
self.package.paths = pkg.paths self.package.paths = pkg.paths
self.package.history = src.history # FIXME self.package.history = src.history # FIXME
self.package.conflicts = pkg.conflicts
self.package.provides = pkg.provides
def read(self, filename): def read(self, filename):
self.readxml(filename) self.readxml(filename)
pisi/specfile.py
+8 -8
View File
@@ -221,10 +221,10 @@ class PackageInfo(object):
self.paths = [PathInfo(x) for x in getAllNodes(node, "Files/Path")] self.paths = [PathInfo(x) for x in getAllNodes(node, "Files/Path")]
historyElts = getAllNodes(node, "History/Update") historyElts = getAllNodes(node, "History/Update")
self.history = [UpdateInfo(x) for x in historyElts] self.history = [UpdateInfo(x) for x in historyElts]
# conflElts = getAllNodes(node, "Conflicts/Package") conflElts = getAllNodes(node, "Conflicts/Package")
# self.conflicts = map(getNodeText, conflElts) self.conflicts = map(getNodeText, conflElts)
# provElts = getAllNodes(node, "Provides/OM") provElts = getAllNodes(node, "Provides/OM")
# self.provides = map(getNodeText, provElts) self.provides = map(getNodeText, provElts)
def elt(self, xml): def elt(self, xml):
node = xml.newNode("Package") node = xml.newNode("Package")
@@ -245,10 +245,10 @@ class PackageInfo(object):
xml.addNodeUnder(node, "Files", path.elt(xml)) xml.addNodeUnder(node, "Files", path.elt(xml))
for update in self.history: for update in self.history:
xml.addNodeUnder(node, "History", update.elt(xml)) xml.addNodeUnder(node, "History", update.elt(xml))
# for conflict in self.conflicts: for conflict in self.conflicts:
# xml.addTextNodeUnder(node, "Conflicts/Package", conflict) xml.addTextNodeUnder(node, "Conflicts/Package", conflict)
# for om in self.provides: for om in self.provides:
# xml.addTextNodeUnder(node, "Provides/OM", om) xml.addTextNodeUnder(node, "Provides/OM", om)
return node return node
def verify(self): def verify(self):