Add preprocess support patch

2009-12-03 09:38:10 +00:00
parent 04e74f42e2
commit 0e698b903d
1 changed files with 82 additions and 0 deletions
@@ -0,0 +1,82 @@
+Index: pisi/pxml/xmlfile.py
+===================================================================
+--- pisi/pxml/xmlfile.py	(revision 26638)
+++ pisi/pxml/xmlfile.py	(working copy)
+@@ -27,12 +27,16 @@
+ 
+ import codecs
+ import exceptions
+import cStringIO
+ 
+ import piksemel as iks
+ 
+ import pisi
+ import pisi.file
+import pisi.config
+ 
+from preprocess import preprocess,PreprocessError
+
+ class Error(pisi.Error):
+     pass
+ 
+@@ -76,11 +80,20 @@
+             localpath = uri.path()
+         else:
+             # this is a remote file, first download it into tmpDir
+-            localpath = pisi.file.File.download(uri, tmpDir, sha1sum=sha1sum, 
+            localpath = pisi.file.File.download(uri, tmpDir, sha1sum=sha1sum,
+                                                 compress=compress,sign=sign, copylocal=copylocal)
+ 
+        st = cStringIO.StringIO()
+
+         try:
+-            self.doc = iks.parse(localpath)
+            from preprocess import preprocess, PreprocessError
+            preprocess(infile=localpath, outfile=st, defines=pisi.config.Config().values.directives)
+            st.seek(0)
+        except:
+            st = open(localpath, "r")
+
+        try:
+            self.doc = iks.parseString(st.read())
+             return self.doc
+         except OSError, e:
+             raise Error(_("Unable to read file (%s): %s") %(localpath,e))
+Index: pisi/configfile.py
+===================================================================
+--- pisi/configfile.py	(revision 26638)
+++ pisi/configfile.py	(working copy)
+@@ -179,6 +179,18 @@
+             dirsitems = []
+         self.dirs = ConfigurationSection("directories", dirsitems)
+ 
+        try:
+            directiveitems = self.parser.items("directives")
+        except ConfigParser.NoSectionError:
+            self.directives = {}
+        else:
+            self.directives = {}
+            for k,v in directiveitems:
+                if v in ("True", "False"):
+                    self.directives[k] = eval(v)
+                else:
+                    self.directives[k] = v
+
+     # get, set and write_config methods added for manipulation of pisi.conf file from Comar to solve bug #5668.
+     # Current ConfigParser does not keep the comments and white spaces, which we do not want for pisi.conf. There
+     # are patches floating in the python sourceforge to add this feature. The write_config code is from python
+@@ -206,7 +218,7 @@
+             r'(?P<padding>\s*)'
+             r'(?P<value>.*)$'
+             )
+-        
+
+         fp = open(self.filePath, "r+")
+         # Default to " = " to match write(), but use the most recent
+         # separator found if the file has any options.
+@@ -313,4 +325,4 @@
+                 fp.write(sect.getvalue())
+ 
+         fp.close()
+-        
+