diff options
| author | Sergey Lapin <slapin@ossfans.org> | 2009-11-20 04:48:57 +0300 |
|---|---|---|
| committer | Sergey Lapin <slapin@ossfans.org> | 2009-11-20 04:48:57 +0300 |
| commit | b7ca90501a633c4434904a7ce49403656edbcc22 (patch) | |
| tree | 17209a712dcf8c91bf6e69e3eaf982e3306adf3b /classes/patch.bbclass | |
| parent | c9d89f888ec69245c56358b454f37cffd8bb87ac (diff) | |
| parent | 7a880a7050b915ea498329242bf5ebc71948301b (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'classes/patch.bbclass')
| -rw-r--r-- | classes/patch.bbclass | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/classes/patch.bbclass b/classes/patch.bbclass index dfb8ec960f..33184df0d0 100644 --- a/classes/patch.bbclass +++ b/classes/patch.bbclass @@ -4,8 +4,6 @@ QUILTRCFILE ?= "${STAGING_BINDIR_NATIVE}/quiltrc" def patch_init(d): - import os, sys - class NotFoundError(Exception): def __init__(self, path): self.path = path @@ -13,8 +11,6 @@ def patch_init(d): return "Error: %s not found." % self.path def md5sum(fname): - import sys - # when we move to Python 2.5 as minimal supported # we can kill that try/except as hashlib is 2.5+ try: @@ -76,8 +72,6 @@ def patch_init(d): def __str__(self): return "Patch Error: %s" % self.msg - import bb, bb.data, bb.fetch - class PatchSet(object): defaults = { "strippath": 1 @@ -253,6 +247,7 @@ def patch_init(d): try: output = runcmd(["quilt", "applied"], self.dir) except CmdError: + import sys if sys.exc_value.output.strip() == "No patches applied": return else: @@ -366,6 +361,7 @@ def patch_init(d): try: self.patchset.Push() except Exception: + import sys os.chdir(olddir) raise sys.exc_value @@ -456,9 +452,6 @@ PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_staging" do_patch[depends] = "${PATCHDEPENDENCY}" python patch_do_patch() { - import re - import bb.fetch - patch_init(d) src_uri = (bb.data.getVar('SRC_URI', d, 1) or '').split() |