From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Wed, 9 Jan 2013 12:44:36 +0000 (+0200)
Subject: rpm.SpecFile: return correct patch file path in patchseries()
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d559f30bbbca578999596a2a4efbc0f7e557961;p=tools%2Fgit-buildpackage.git

rpm.SpecFile: return correct patch file path in patchseries()

Fixes importing patches when the 'Patch:' tag contains an URI.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---

diff --git a/gbp/rpm/__init__.py b/gbp/rpm/__init__.py
index 181cbaa7..d9e868fd 100644
--- a/gbp/rpm/__init__.py
+++ b/gbp/rpm/__init__.py
@@ -520,7 +520,9 @@ class SpecFile(object):
         patchdir = os.path.dirname(self.specfile)
         for n, p in sorted(self.patches.iteritems()):
             if p['autoupdate'] and p['apply']:
-                series.append(Patch(os.path.join(patchdir, p['filename']), strip = int(p['strip'])))
+                fname = os.path.basename(p['filename'])
+                series.append(Patch(os.path.join(patchdir, fname),
+                                    strip = int(p['strip'])))
         return series