[oe-commits] Khem Raj : Revert "lib/oe/patch.py: Dont import patches but symlink them instead"

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: bfe9198ddabf08f84c744dcbf82d4a52c295508d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=bfe9198ddabf08f84c744dcbf82d4a52c295508d

Author: Khem Raj <raj.khem at gmail.com>
Date:   Wed Jun  9 18:04:09 2010 -0700

Revert "lib/oe/patch.py: Dont import patches but symlink them instead"

pushed wrong branch. It needs to be reviewed before pushing.

This reverts commit 428c2de6d27dd49274b9884c3123b053c42af0ce.

---

 lib/oe/patch.py |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/oe/patch.py b/lib/oe/patch.py
index 607ad44..7f6b0fe 100644
--- a/lib/oe/patch.py
+++ b/lib/oe/patch.py
@@ -230,10 +230,15 @@ class QuiltTree(PatchSet):
         if not self.initialized:
             self.InitFromDir()
         PatchSet.Import(self, patch, force)
-        os.symlink(patch["file"], self._quiltpatchpath(patch["file"]))
-        f = open(os.path.join(self.dir, "patches","series"), "a");
-        f.write(os.path.basename(patch["file"]) + " -p" + patch["strippath"]+"\n")
-        f.close()
+
+        args = ["import", "-p", patch["strippath"]]
+        if force:
+            args.append("-f")
+            args.append("-dn")
+        args.append(patch["file"])
+
+        self._runcmd(args)
+
         patch["quiltfile"] = self._quiltpatchpath(patch["file"])
         patch["quiltfilemd5"] = bb.utils.md5_file(patch["quiltfile"])