* revert this.

We upgraded pisi db. But "from imports" of pisi do not let us reload all
  the extracted modules and than safely run rebuild-db.

pisi/build.py

@@ -496,7 +496,7 @@ class Builder:
                                             targetDir=ctx.config.tmp_dir())
 
             ctx.ui.action(_("* Applying patch: %s") % patch.filename)
-            util.do_patch(self.srcDir, patchFile, level=patch.level)
+            util.do_patch(self.srcDir, patchFile, level=patch.level, target=patch.target)
 
     def generate_static_package_object(self):
         ar_files = []

pisi/specfile.py

@@ -68,6 +68,7 @@ class Patch:
     s_Filename = [autoxml.String, autoxml.mandatory]
     a_compressionType = [autoxml.String, autoxml.optional]
     a_level = [autoxml.Integer, autoxml.optional]
+    a_target = [autoxml.String, autoxml.optional]
 
     #FIXME: what's the cleanest way to give a default value for reading level?
     #def decode_hook(self, node, errs, where):
@@ -80,6 +81,8 @@ class Patch:
             s += ' (' + self.compressionType + ')'
         if self.level:
             s += ' level:' + self.level
+        if self.target:
+            s += ' target:' + self.target
         return s
 
 

pisi/util.py

@@ -480,17 +480,19 @@ def uncompress(patchFile, compressType="gz", targetDir=None):
     return filePath
 
 
-def do_patch(sourceDir, patchFile, level = 0):
+def do_patch(sourceDir, patchFile, level = 0, target = ''):
     """Apply given patch to the sourceDir."""
     cwd = os.getcwd()
     os.chdir(sourceDir)
 
     if level == None:
         level = 0
+    if target == None:
+        target = ''
 
     check_file(patchFile)
-    (ret, out, err) = run_batch("patch -p%d < %s" %
-                                    (level, patchFile))
+    (ret, out, err) = run_batch("patch -p%d %s < %s" %
+                                    (level, target, patchFile))
     if ret:
         if out is None and err is None:
             # Which means stderr and stdout directed so they are None