From 217263eba5c8ada53352d1375701ddf9764ff6c1 Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Mon, 16 Jun 2008 17:53:35 +0200 Subject: Don't set the version number twice makes sure git-import-dsc doesn't use the Version: line from the message instead of the signature on old PGP signatures Closes: #486397 --- gbp/deb_utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gbp/deb_utils.py b/gbp/deb_utils.py index eb3b0819..a96bb8ea 100644 --- a/gbp/deb_utils.py +++ b/gbp/deb_utils.py @@ -36,12 +36,13 @@ class DscFile(object): self.pkg = "" self.tgz = "" self.diff = "" + self.upstream_version = "" self.dscfile = os.path.abspath(dscfile) f = file(self.dscfile) fromdir = os.path.dirname(os.path.abspath(dscfile)) for line in f: m = self.version_re.match(line) - if m: + if m and not self.upstream_version: if '-' in m.group('version'): self.debian_version = m.group('version').split("-")[-1] self.upstream_version = "-".join(m.group('version').split("-")[0:-1]) -- cgit v1.2.3