Package: git-buildpackage
Version: 0.5.19
Severity: normal
Tags: patch
If upstream_version contains an epoch checking for an already existing
tag did fail and afterwards a git error was raised. Version check must
use upstream version without epoch to check for a tag to let the user
override an already existing tag.
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.26-2-xen-686 (SMP w/1 CPU core)
Locale: LANG=c, LC_CTYPE=c (charmap=locale: Cannot set LC_CTYPE to default
locale: No such file or directory
locale: Cannot set LC_MESSAGES to default locale: No such file or directory
locale: Cannot set LC_ALL to default locale: No such file or directory
ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash
Versions of packages git-buildpackage depends on:
ii devscripts 2.10.71 scripts to make the life of a Debi
ii git [git-core] 1:1.7.4.1-3 fast, scalable, distributed revisi
ii python 2.6.6-3+squeeze6 interactive high-level object-orie
ii python-dateutil 1.4.1-3 powerful extensions to the standar
ii python-support 1.0.11 automated rebuilding support for P
Versions of packages git-buildpackage recommends:
ii cowbuilder 0.62+nmu2 pbuilder running on cowdancer
ii pristine-tar 1.13 regenerate pristine tarballs
Versions of packages git-buildpackage suggests:
pn git-load-dirs <none> (no description available)
pn python-notify <none> (no description available)
-- debconf information excluded
>From 432828dc2a7c4e57aa9de8fe29b6f67dacd2973b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= <bjoern.ri...@intevation.de>
Date: Tue, 5 Apr 2011 10:42:31 +0200
Subject: [PATCH] Fix check if debian tag already exists
If upstream_version contains an epoch checking for an already existing
tag did fail and afterwards a git error was raised. Version check must
use upstream version without epoch to check for a tag to let the user
override an already existing tag.
---
git-import-dsc | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/git-import-dsc b/git-import-dsc
index 30284aa..44cb58e 100755
--- a/git-import-dsc
+++ b/git-import-dsc
@@ -256,11 +256,12 @@ def main(argv):
format = [(options.upstream_tag, "Upstream"), (options.debian_tag,
"Debian")][src.native]
tag = build_tag(format[0], src.upstream_version)
msg = "%s version %s" % (format[1], src.upstream_version)
+ version = "%s-%s" % (src.upstream_version, src.debian_version)
- if repo.find_version(options.debian_tag, src.debian_version):
- gbp.log.warn("Version %s already imported." % src.version)
+ if repo.find_version(options.debian_tag, version):
+ gbp.log.warn("Version %s already imported." % version)
if options.allow_same_version:
- gbp.log.info("Moving tag of version '%s' since import
forced" % src.version)
+ gbp.log.info("Moving tag of version '%s' since import
forced" % version)
move_tag_stamp(repo, options.debian_tag, src.version)
else:
raise SkipImport
--
1.7.4.1
>From 90832a0e10a101fdf4c516bf408ceacdbdbcf527 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= <bjoern.ri...@intevation.de>
Date: Tue, 5 Apr 2011 10:36:58 +0200
Subject: [PATCH] correct indentation
---
git-import-dsc | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/git-import-dsc b/git-import-dsc
index 5062014..30284aa 100755
--- a/git-import-dsc
+++ b/git-import-dsc
@@ -257,12 +257,12 @@ def main(argv):
tag = build_tag(format[0], src.upstream_version)
msg = "%s version %s" % (format[1], src.upstream_version)
- if repo.find_version(options.debian_tag, src.version):
- gbp.log.warn("Version %s already imported." % src.version)
- if options.allow_same_version:
+ if repo.find_version(options.debian_tag, src.debian_version):
+ gbp.log.warn("Version %s already imported." % src.version)
+ if options.allow_same_version:
gbp.log.info("Moving tag of version '%s' since import forced" % src.version)
move_tag_stamp(repo, options.debian_tag, src.version)
- else:
+ else:
raise SkipImport
commit = repo.find_version(format[0], src.upstream_version)
--
1.7.4.1
