[Uludag-commits] r17548 - branches/pisi-devel/pisi/pxml

[uludag-commits at pardus.org.tr]

Author: faik
Date: Tue Apr  1 16:33:45 2008
New Revision: 17548

Modified:
   branches/pisi-devel/pisi/pxml/xmlfile.py
Log:
Merge from trunk



Modified: branches/pisi-devel/pisi/pxml/xmlfile.py
=================================================================
--- branches/pisi-devel/pisi/pxml/xmlfile.py	(original)
+++ branches/pisi-devel/pisi/pxml/xmlfile.py	Tue Apr  1 16:33:45 2008
@@ -65,10 +65,11 @@
     def readxml(self, uri, tmpDir='/tmp', sha1sum=False,
                 compress=None, sign=None, copylocal = False):
 
+        uri = pisi.file.File.make_uri(uri)
+
         # workaround for repo index files to fix 
         # rev. 17027 regression (http://liste.pardus.org.tr/gelistirici/2008-February/011133.html)
-        compressed = uri.endswith(".bz2") or uri.endswith(".gz")
-        uri = pisi.file.File.make_uri(uri)
+        compressed = str(uri).endswith(".bz2") or str(uri).endswith(".gz")
 
         if uri.is_local_file() and not compressed:
             # this is a local file