aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2010-06-09 18:04:09 -0700
committerKhem Raj <raj.khem@gmail.com>2010-06-09 18:04:09 -0700
commitbfe9198ddabf08f84c744dcbf82d4a52c295508d (patch)
tree9b8649ea1e820b28ade19b8e0feed79aed5aceea /lib
parent070e46f2932b254a617d7ce88af9b078c2a2849f (diff)
downloadopenembedded-bfe9198ddabf08f84c744dcbf82d4a52c295508d.tar.gz
openembedded-bfe9198ddabf08f84c744dcbf82d4a52c295508d.tar.bz2
openembedded-bfe9198ddabf08f84c744dcbf82d4a52c295508d.zip
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.
Diffstat (limited to 'lib')
-rw-r--r--lib/oe/patch.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/oe/patch.py b/lib/oe/patch.py
index 607ad44321..7f6b0fe8de 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"])