Your message dated Wed, 06 Apr 2011 21:18:04 +0000
with message-id <[email protected]>
and subject line Bug#620950: fixed in git-buildpackage 0.5.21
has caused the Debian Bug report #620950,
regarding git-buildpackage: Fix check if debian tag already exists
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
620950: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=620950
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
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?= <[email protected]>
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?= <[email protected]>
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
--- End Message ---
--- Begin Message ---
Source: git-buildpackage
Source-Version: 0.5.21
We believe that the bug you reported is fixed in the latest version of
git-buildpackage, which is due to be installed in the Debian FTP archive:
git-buildpackage_0.5.21.dsc
to main/g/git-buildpackage/git-buildpackage_0.5.21.dsc
git-buildpackage_0.5.21.tar.gz
to main/g/git-buildpackage/git-buildpackage_0.5.21.tar.gz
git-buildpackage_0.5.21_all.deb
to main/g/git-buildpackage/git-buildpackage_0.5.21_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Guido Günther <[email protected]> (supplier of updated git-buildpackage package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Wed, 06 Apr 2011 20:35:37 +0200
Source: git-buildpackage
Binary: git-buildpackage
Architecture: source all
Version: 0.5.21
Distribution: unstable
Urgency: low
Maintainer: Guido Günther <[email protected]>
Changed-By: Guido Günther <[email protected]>
Description:
git-buildpackage - Suite to help with Debian packages in Git repositories
Closes: 620950
Changes:
git-buildpackage (0.5.21) unstable; urgency=low
.
[ Guido Günther ]
* [d8142c7] git-import-dsc: don't silently drop the epoch in tags
(Closes: #620950)
* [ebc19c7] docs: Document Gbp-Pq-Topic: tag
* [82e5f4d] git-buildpackage: Call gbp.update_submodules before exporting a
tarball or creating a separate build tree. We invoke git-submodule with
--no-fetch to not break offline operation.
* [dff62f2] Make submodule support conditional
Checksums-Sha1:
f70dec73547988d53163a6d1b0c2a9efacb1c630 1102 git-buildpackage_0.5.21.dsc
00f026014cb86d79b5d375bf80612ceeaa095c2f 104940 git-buildpackage_0.5.21.tar.gz
0e1aa203b00e5a5b7e2e2846d0497bd7238418ff 127968 git-buildpackage_0.5.21_all.deb
Checksums-Sha256:
477de80e850950ec6e9fe430bb800cb96ca0ddf63c184add179ef9251f32a185 1102
git-buildpackage_0.5.21.dsc
a8f16a5ec602e865cb7b126fa20bc709d70f5e57d63cb9c933544fc8ed8cb1c3 104940
git-buildpackage_0.5.21.tar.gz
c7bcf723c4908c4ac18a66d28d1dc533f4bb4df397db1a351bb2b4879a4220c3 127968
git-buildpackage_0.5.21_all.deb
Files:
7720417be3a108912f7aa59b1a6ae450 1102 vcs optional git-buildpackage_0.5.21.dsc
6aa197149a07bf5e5c3e7eae11cea161 104940 vcs optional
git-buildpackage_0.5.21.tar.gz
856afa5d44cd148c314d057c8dfc0198 127968 vcs optional
git-buildpackage_0.5.21_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iD8DBQFNnNGfn88szT8+ZCYRAiSeAJ9tcnY5+TRFiHBnG8P8PcCze6893wCeODYZ
tTo1lpoEYVtnc4pP4nLzbFM=
=mmhg
-----END PGP SIGNATURE-----
--- End Message ---
