diff options
| author | Guido Guenther <agx@sigxcpu.org> | 2008-06-16 17:53:35 +0200 |
|---|---|---|
| committer | Guido Guenther <agx@sigxcpu.org> | 2008-06-16 17:53:35 +0200 |
| commit | 217263eba5c8ada53352d1375701ddf9764ff6c1 (patch) | |
| tree | e877d2793d9c5f39a8f549ff0c8ea75ae3e3f39d | |
| parent | 063fab51b5f08cb42b3fa03241c434ed90a2d336 (diff) | |
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
| -rw-r--r-- | gbp/deb_utils.py | 3 |
1 files changed, 2 insertions, 1 deletions
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]) |