* provides/conflicts seysileri

doc/pisi.lyx

@@ -840,14 +840,26 @@ Override
 Conflicts:
 \series default 
  Paketin almas/ilevini yerine getirmesi iin, sistemde olmamas gereken
- paketleri belirtir.
+ paketleri belirtir, bu rnein ayn dosyay iki paketin de tamas durumunda
+ olabilir.
+ 
+\series bold 
+Package:
+\series default 
+ Olmamas gereken paket adn verir.
 \layout Itemize
 
 
 \series bold 
-Provides:
+Provides: 
 \series default 
- FIXME: ????????????????????????
+Paketin salad OMAR OM ayaklarnn bir listesini verir.
+ 
+\series bold 
+OM: 
+\series default 
+omar OM ayann adn verir.
+ (FIXME)
 \layout Itemize
 
 

pisi/install.py

@@ -64,6 +64,8 @@ def install(package_fn):
         packagedb.add_package(metadata.package) # terrible solution it seems
     
     # check conflicts
+    if 
+    
     # check dependencies
     if not dependency.installable(metadata.package.name):
         raise InstallError("Package not installable")

pisi/specfile.py

@@ -221,6 +221,10 @@ class PackageInfo(object):
         self.paths = [PathInfo(x) for x in getAllNodes(node, "Files/Path")]
         historyElts = getAllNodes(node, "History/Update")
         self.history = [UpdateInfo(x) for x in historyElts]
+        conflElts = getAllNodes(node, "Conflicts/Package")
+        self.conflicts = map(getNodeText, conflElts)
+        provElts = getAllNodes(node, "Provides/OM")
+        self.provides = map(getNodeText, provElts)
 
     def elt(self, xml):
         node = xml.newNode("Package")
@@ -241,6 +245,10 @@ class PackageInfo(object):
             xml.addNodeUnder(node, "Files", path.elt(xml))
         for update in self.history:
             xml.addNodeUnder(node, "History", update.elt(xml))
+        for conflict in self.conflicts:
+            xml.addTextNodeUnder(node, "Conflicts/Package", conflict)
+        for om in self.provides:
+            xml.addTextNodeUnder(node, "Provides/OM", om)
         return node
 
     def verify(self):