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

[uludag-commits at pardus.org.tr]

Author: gokmen.goksel
Date: Mon Feb  4 23:44:27 2008
New Revision: 16975

Modified:
   trunk/pardusman/src/gui.py
   trunk/pardusman/src/packages.py
Log:
* Use status bar for error messages. Revert 16878 (new Pisi workarounds); we need a working copy of Pardusman :-p

Modified: trunk/pardusman/src/gui.py
=================================================================
--- trunk/pardusman/src/gui.py	(original)
+++ trunk/pardusman/src/gui.py	Mon Feb  4 23:44:27 2008
@@ -231,7 +231,7 @@
         if not self.ui2project():
             return
         if self.project.release_files and not os.path.exists(self.project.release_files):
-            self.console.error(_("Release files directory does not exist."))
+            self.console.message(_("Release files directory does not exist."))
             return
         return True
     
@@ -274,7 +274,7 @@
             self.project.title = tmp
         else:
             self.project.title = None
-            self.console.error(_("Project title not given."))
+            self.console.message(_("Project title not given."))
             return
         tmp = unicode(self.release_files.text())
         if tmp:
@@ -291,14 +291,14 @@
             self.project.work_dir = tmp
         else:
             self.project.work_dir = None
-            self.console.error(_("Project directory not given."))
+            self.console.message(_("Project directory not given."))
             return
         tmp = unicode(self.repo_uri.text())
         if tmp:
             self.project.repo_uri = tmp
         else:
             self.project.repo_uri = None
-            self.console.error(_("Repository address not given."))
+            self.console.message(_("Repository address not given."))
             return
         if self.project_type.selectedId() == 0:
             self.project.type = "install"

Modified: trunk/pardusman/src/packages.py
=================================================================
--- trunk/pardusman/src/packages.py	(original)
+++ trunk/pardusman/src/packages.py	Mon Feb  4 23:44:27 2008
@@ -161,18 +161,6 @@
         for name in package_list:
             doc.insertNode(self.packages[name].node)
 
-        # since new PiSi (pisi-db) needs component info in index file, we need to copy it from original index that user specified
-        indexpath = fetch_uri(self.base_uri, self.cache_dir, self.index_name, None, False)
-        if indexpath.endswith(".bz2"):
-            import bz2
-            data = file(indexpath).read()
-            data = bz2.decompress(data)
-            doc_index = piksemel.parseString(data)
-        else:
-            doc_index = piksemel.parse(indexpath)
-        for comp_node in doc_index.tags("Component"):
-            doc.insertNode(comp_node)
-
         return doc.toPrettyString()
 
     def make_local_repo(self, path, package_list):