[Uludag-commits] r16211 - trunk/pardusman/src

[uludag-commits at pardus.org.tr]

Author: caglar
Date: Mon Dec  3 15:07:08 2007
New Revision: 16211

Modified:
   trunk/pardusman/src/packages.py
   trunk/pardusman/src/project.py
Log:
source index olmadan da CD yapabil from Bahadır, deneme #1

Modified: trunk/pardusman/src/packages.py
=================================================================
--- trunk/pardusman/src/packages.py	(original)
+++ trunk/pardusman/src/packages.py	Mon Dec  3 15:07:08 2007
@@ -118,7 +118,6 @@
         self.inst_size = 0
         self.packages = {}
         self.components = {}
-        self.distribution = None
     
     def parse_index(self, console=None, update_repo=False):
         path = fetch_uri(self.base_uri, self.cache_dir, self.index_name, console, update_repo)
@@ -129,15 +128,12 @@
             doc = piksemel.parseString(data)
         else:
             doc = piksemel.parse(path)
-        self.distribution = doc.getTag('Distribution')
         for tag in doc.tags('Package'):
             p = Package(tag)
             self.packages[p.name] = p
             self.size += p.size
             self.inst_size += p.inst_size
-        for tag in doc.tags('Component'):
-            c = Component(tag)
-            self.components[c.name] = c
+            self.components[p.component] = []
         for name in self.packages:
             p = self.packages[name]
             for name2 in p.depends:
@@ -146,7 +142,7 @@
                 else:
                     print "Error: package %s depends on non existing package %s" % (p.name, name2)
             if self.components.has_key(p.component):
-                self.components[p.component].packages.append(p.name)
+                self.components[p.component].append(p.name)
         from pisi.graph import Digraph, CycleException
         dep_graph = Digraph()
         for name in self.packages:
@@ -162,11 +158,8 @@
     
     def make_index(self, package_list):
         doc = piksemel.newDocument("PISI")
-        doc.insertNode(self.distribution)
         for name in package_list:
             doc.insertNode(self.packages[name].node)
-        for name in self.components:
-            doc.insertNode(self.components[name].node)
         return doc.toPrettyString()
     
     def make_local_repo(self, path, package_list):
@@ -201,7 +194,7 @@
                 collect(item)
         collect(package_name)
         if self.components.has_key("system.base"):
-            for item in self.components["system.base"].packages:
+            for item in self.components["system.base"]:
                 deps.add(item)
                 collect(item)
         return deps

Modified: trunk/pardusman/src/project.py
=================================================================
--- trunk/pardusman/src/project.py	(original)
+++ trunk/pardusman/src/project.py	Mon Dec  3 15:07:08 2007
@@ -209,7 +209,7 @@
             for dep in p.depends:
                 collect(dep)
         for component in self.selected_components:
-            for package in repo.components[component].packages:
+            for package in repo.components[component]:
                 collect(package)
         for package in self.selected_packages:
             collect(package)