Your message dated Sun, 27 Jun 2010 01:17:06 +0000
with message-id <e1osguc-0006ir...@ries.debian.org>
and subject line Bug#587178: fixed in gitpkg 0.15
has caused the Debian Bug report #587178,
regarding git-importdeb: fails with current git
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 ow...@bugs.debian.org
immediately.)
--
587178: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=587178
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: gitpkg
Version: 0.14
Severity: serious
Tags: patch
"git status" used to be synonymous to "git commit --dry-run", and is used that
way
in git-importdeb. The script now fails because "-a" is not understood by "git
status"
any more because of this.
commit 6a7b93ccfe1127de3e8398eeaa0b5e9e9a88c352
Author: Yann Dirson <ydir...@altern.org>
Date: Fri Jun 25 23:18:59 2010 +0200
Use "git commit --dry-run" not "git status", now that they are different.
This probably breaks with old git versions ?
diff --git a/git-debimport b/git-debimport
index 3ffc955..8781dda 100755
--- a/git-debimport
+++ b/git-debimport
@@ -213,7 +213,7 @@ if [ -n "$PACKAGE_TARS" ]; then
EMAIL=\<$(dpkg-parsechangelog | sed -n 's/Maintainer: //p' | cut -d\<
-f2)
git add .
- if git --no-pager status -a > /dev/null 2>&1; then
+ if git --no-pager commit --dry-run -a > /dev/null 2>&1; then
GIT_AUTHOR_NAME="$AUTHOR" GIT_COMMITTER_NAME="$AUTHOR" \
GIT_AUTHOR_EMAIL="$EMAIL" GIT_COMMITTER_EMAIL="$EMAIL" \
GIT_AUTHOR_DATE="$DATE" GIT_COMMITTER_DATE="$DATE" \
@@ -288,7 +288,7 @@ for f in $PACKAGE_DIFFS; do
DATE=$(file -L
$PKG_ROOT$PACKAGES_DIR/${PACKAGE_NAME}_${UPSTREAM_VERSION}.orig.tar.gz | sed -n
"s/.*, last modified: \([^,]*\),*.*/\1/p")
git add .
- if git --no-pager status -a > /dev/null 2>&1; then
+ if git --no-pager commit --dry-run -a > /dev/null 2>&1; then
GIT_AUTHOR_DATE="$DATE" GIT_COMMITTER_DATE="$DATE" \
git commit -a -m "git-debimport
${PACKAGE_NAME}_${UPSTREAM_VERSION}.orig.tar.gz"
else
@@ -320,7 +320,7 @@ for f in $PACKAGE_DIFFS; do
DATE=$(file -L
$PKG_ROOT$PACKAGES_DIR/${PACKAGE_NAME}_${UPSTREAM_VERSION}.orig.tar.gz | sed -n
"s/.*, last modified: \([^,]*\),*.*/\1/p")
git add .
- if git --no-pager status -a > /dev/null 2>&1; then
+ if git --no-pager commit --dry-run -a > /dev/null 2>&1; then
GIT_AUTHOR_DATE="$DATE" GIT_COMMITTER_DATE="$DATE" \
git commit -a -m "git-debimport
${PACKAGE_NAME}_${UPSTREAM_VERSION}.orig.tar.gz"
else
@@ -352,7 +352,7 @@ for f in $PACKAGE_DIFFS; do
EMAIL=\<$(dpkg-parsechangelog | sed -n 's/Maintainer: //p' | cut -d\< -f2)
git add .
- if git --no-pager status -a > /dev/null 2>&1; then
+ if git --no-pager commit --dry-run -a > /dev/null 2>&1; then
GIT_AUTHOR_NAME="$AUTHOR" GIT_COMMITTER_NAME="$AUTHOR" \
GIT_AUTHOR_EMAIL="$EMAIL" GIT_COMMITTER_EMAIL="$EMAIL" \
GIT_AUTHOR_DATE="$DATE" GIT_COMMITTER_DATE="$DATE" \
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (101,
'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32.13-evms (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages gitpkg depends on:
ii dpkg-dev 1.15.7.2 Debian package development tools
ii git [git-core] 1:1.7.1-1 fast, scalable, distributed revisi
ii git-core 1:1.7.1-1 fast, scalable, distributed revisi
gitpkg recommends no packages.
Versions of packages gitpkg suggests:
ii devscripts 2.10.64 scripts to make the life of a Debi
-- no debconf information
--- End Message ---
--- Begin Message ---
Source: gitpkg
Source-Version: 0.15
We believe that the bug you reported is fixed in the latest version of
gitpkg, which is due to be installed in the Debian FTP archive:
gitpkg_0.15.dsc
to main/g/gitpkg/gitpkg_0.15.dsc
gitpkg_0.15.tar.gz
to main/g/gitpkg/gitpkg_0.15.tar.gz
gitpkg_0.15_all.deb
to main/g/gitpkg/gitpkg_0.15_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 587...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Ron Lee <r...@debian.org> (supplier of updated gitpkg 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 ftpmas...@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Sun, 27 Jun 2010 09:51:24 +0930
Source: gitpkg
Binary: gitpkg
Architecture: source all
Version: 0.15
Distribution: unstable
Urgency: low
Maintainer: Ron Lee <r...@debian.org>
Changed-By: Ron Lee <r...@debian.org>
Description:
gitpkg - tools for maintaining Debian packages with git
Closes: 521764 565503 587175 587178 587181
Changes:
gitpkg (0.15) unstable; urgency=low
.
* Updates to git-debimport.
* The git 1.7.0-rc1 release breaks status -a, replacing it with a --dry-run
option to commit. There is no option compatible with git from both before
and after that so go with the flow and version the git Depends accordingly.
Closes: #587178
* Switch the git Depends from git-core too while we are at that.
* Tweak the package sorting a bit further. Prune off all non-version text
when feeding the comparator, since the initial find may include packages
in different subdirs which can otherwise distort the sort. Protect the
arithmetic operation in the sort from tripping the `set -e` trap if the
sort does go all the way up to the first entry in the list. Thanks to
Yann Dirson for noticing this and sending patches. Closes: #587175
* Add support for format 3.0 packages. Thanks to Craig Small for a proof
patch that showed how little actually needed to be changed to provide
initial support for debian.tar.gz 'diffs'. Closes: #565503
* Add support for xz and bz2 compressed packages too.
* Fix for debsnap gratuitously breaking its argument passing convention,
but this now works again with snapshot.debian.org if you have debsnap
from devscripts 2.10.63 or later (modulo some already known bugs in
debsnap itself with handling certain snapshot data). Closes: #521764
* Handle tarballs that don't have their source under a single subdir.
dpkg-source special cases that, so do something similar here too rather
than just blindly stripping off the top level when unpacking.
Closes: #587181
Checksums-Sha1:
68608d233d0c61023abe10763f1b73e394690be2 783 gitpkg_0.15.dsc
3f76821d449285b2344685734cc9bc082e8b0758 26190 gitpkg_0.15.tar.gz
d7752ec661aaa9b58917d3b215a83a7d554a5f8a 29380 gitpkg_0.15_all.deb
Checksums-Sha256:
91fa4f61ce3bccb9f6cae2b9ac5794945af8b365206f42db51727ed2165bc8be 783
gitpkg_0.15.dsc
ec77c10b378ccb88a99bcb82e0932da6be9214a65f908cceb3f3744ff18724a6 26190
gitpkg_0.15.tar.gz
f22a2863e2eb22752300c67920f41ed1f9738ebfac573d5f377867a5e892d013 29380
gitpkg_0.15_all.deb
Files:
1063b106df7bdb942343d1dcca464fc8 783 vcs optional gitpkg_0.15.dsc
36e0bcd3c64c2b2672f2a11833f1a541 26190 vcs optional gitpkg_0.15.tar.gz
090d9b5620f395724ee4edb174704ccd 29380 vcs optional gitpkg_0.15_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iD8DBQFMJqPnp4BCHGgCHOQRAg0cAJ4zqUgmmQJsubY3T7NGl7pp9Xlt1gCdGKs3
XN1/Bd4PDtj56Heyz8cJF2M=
=Hhs6
-----END PGP SIGNATURE-----
--- End Message ---