From de7005af625362a24f2aa2333ce8891e9ea67ed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Tue, 20 Feb 2007 14:15:01 +0000 Subject: [PATCH] remove target support from do_patch, it was added by me and i realize its a design error. Seems no package uses that attribute, and if one exists that package should be corrected not PiSi. --- pisi/specfile.py | 3 --- pisi/util.py | 8 +++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pisi/specfile.py b/pisi/specfile.py index 636d8a34..0fa5d224 100644 --- a/pisi/specfile.py +++ b/pisi/specfile.py @@ -68,7 +68,6 @@ 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): @@ -81,8 +80,6 @@ class Patch: s += ' (' + self.compressionType + ')' if self.level: s += ' level:' + self.level - if self.target: - s += ' target:' + self.target return s diff --git a/pisi/util.py b/pisi/util.py index 273fab98..666461d5 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -469,19 +469,17 @@ def uncompress(patchFile, compressType="gz", targetDir=None): return filePath -def do_patch(sourceDir, patchFile, level = 0, target = ''): +def do_patch(sourceDir, patchFile, level = 0): """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 < %s" % - (level, target, patchFile)) + (ret, out, err) = run_batch("patch -p%d < %s" % + (level, patchFile)) if ret: if out is None and err is None: # Which means stderr and stdout directed so they are None