Your message dated Fri, 16 Aug 2013 00:33:05 +0000 with message-id <[email protected]> and subject line Bug#712166: fixed in devscripts 2.13.3 has caused the Debian Bug report #712166, regarding debcommit: exits on clean working directories on git status due to changed output message in 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 [email protected] immediately.) -- 712166: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=712166 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Package: devscripts Version: 2.13.2 Severity: normal Tags: patch Hi Recent git version uploaded to unstable changed the output format of git status when the working directory is clean: Older versions have: nothing to commit (working directory clean) whereas git 1:1.8.3.1-1 as uploaded in unstable has nothing to commit, working directory clean 518 elsif ($prog eq 'git') { 519 if (! @files_to_commit && ($all || $release)) { 520 # check to see if the WC is clean. git-commit would exit 521 # nonzero, so don't run it in --all or --release mode. 522 my $status=`LANG=C git status`; 523 if ($status=~/nothing to commit \(working directory clean\)/) { 524 print $status; 525 return; 526 } 527 } so with newer git versions the status on line 523 do not match the expression and git will exit later on. Something like $status =~ /nothing to commit/ && $status =~ /working directory clean/ would do the trick. Regards, Salvatore>From b721166ad224c882a23911b3d057a7ce636f00a3 Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso <[email protected]> Date: Thu, 13 Jun 2013 20:02:04 +0200 Subject: [PATCH] Adapt to changed output for git status in newer git versions Newer versions of git emit "nothing to commit, working directory clean" instead of "nothing to commit (working directory clean)" on git status when a working directory is clean. Adjust the parsing to match for both cases, as git commit would exit with nonzero status and thus debcommit exit. --- scripts/debcommit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/debcommit.pl b/scripts/debcommit.pl index 675d063..f129f38 100755 --- a/scripts/debcommit.pl +++ b/scripts/debcommit.pl @@ -520,7 +520,7 @@ sub commit { # check to see if the WC is clean. git-commit would exit # nonzero, so don't run it in --all or --release mode. my $status=`LANG=C git status`; - if ($status=~/nothing to commit \(working directory clean\)/) { + if ($status =~ /nothing to commit/ && $status =~ /working directory clean/) { print $status; return; } -- 1.7.10.4
--- End Message ---
--- Begin Message ---Source: devscripts Source-Version: 2.13.3 We believe that the bug you reported is fixed in the latest version of devscripts, which is due to be installed in the Debian FTP archive. 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. James McCoy <[email protected]> (supplier of updated devscripts 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: Thu, 15 Aug 2013 20:00:57 -0400 Source: devscripts Binary: devscripts Architecture: source amd64 Version: 2.13.3 Distribution: unstable Urgency: low Maintainer: Devscripts Devel Team <[email protected]> Changed-By: James McCoy <[email protected]> Description: devscripts - scripts to make the life of a Debian Package maintainer easier Closes: 600048 610712 658999 704236 709999 711467 712166 712227 712261 712701 714599 714835 715572 Changes: devscripts (2.13.3) unstable; urgency=low . [ gregor herrmann ] * debcommit: Add the source package name to commit/tag messages. (Closes: #704236) . [ Paul Wise ] * In chdist bash completion, don't print warnings if ~/.chdist is missing * Support 'new' in the rmadison URL list. . [ James McCoy ] * dpkg-buildpackage: Use "dpkg-checkbuilddeps -A" for arch-indep builds. Bump dpkg-dev Depends to 1.16.4 accordingly. * Suppress "given/when is experimental" warnings when using Perl 5.18. * mk-build-deps: Take Build-Conflicts(-Indep) into account. (Closes: #712227) * debcommit: Use "git status --porcelain" to check for a dirty working directory. (Closes: #712166) * uscan: Add "Accept: */*" header to fix downloading from Alioth. Thanks to Dmitry Smirnov for the patch. (Closes: #712261) * transition-check: Work around Pod::Simple change which causes Perl 5.18's pod2man to fail. (Closes: #714599) * licensecheck: + Check haskell files. Thanks to Jens Petersen for the patch. + Handle differing lengths of comment leaders when autodetecting comments. (Closes: #714835) * uscan/rc-alert: Fix roff errors in man pages. Thanks to Eric S. Raymond for the patch. (Closes: #712701) * dscverify: Use ~/.gnupg/trustedkeys.gpg, if available. (Closes: #600048) . [ Chris Boot ] * bts: Fix no-mutt option. (Closes: #709999) . [ Daniel Kahn Gillmor ] * Enable OpenPGP signature verification (Closes: #610712) . [ Yaroslav Halchenko ] * licensecheck: Check .go (Go) files (Closes: #711467) * wnpp-check: Add bug URL to output and reorder columns to ease reading. (Closes: #715572) . [ Bernhard R. Link ] * uscan: properly cope with colons and minus signs in upstream versions. (Closes: #658999) . [ Phillip Hands ] * licensecheck: + allow plural: copyright notices + ignore "copyright holders" + alternative BSD-3 wording "authors" and "_any_ contributors" + ignore #defines containing (c) + fix "copyright ownership" + ignore "copyright statement" + ignore "copyright string" + ignore coyright (claim|is|in), and fix test + ignore "copyright to" Checksums-Sha1: 516c5bb5496f1ec7e0aa143ac7310121a9802f2f 1483 devscripts_2.13.3.dsc f2bb5d52f08a0b03583187bf7fb1e9f868966369 573368 devscripts_2.13.3.tar.xz af989b8067394ee26fcfe09a60e4b96b725ab6e9 854416 devscripts_2.13.3_amd64.deb Checksums-Sha256: e334049b8edf531756ad7b408dcec5f51e6e6df5f4720c02ca7ac9a93371a2fc 1483 devscripts_2.13.3.dsc 216a8a63e0a6e4d5f677ceb52e6330aa90851471fe337e87f3d053a2c1538556 573368 devscripts_2.13.3.tar.xz 8757b74d7d5390c7cad72aa77f07c68f7d8e9a6c4f08608886ecdb77e84a7519 854416 devscripts_2.13.3_amd64.deb Files: d98029fd3966299e01baa2bbed63cffc 1483 devel optional devscripts_2.13.3.dsc 1273a87daf9ff4d47f079687c2262a8c 573368 devel optional devscripts_2.13.3.tar.xz eb575ee6b000fd1874fa16638ff98190 854416 devel optional devscripts_2.13.3_amd64.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iEYEARECAAYFAlINbqwACgkQDb3UpmEybUDnRACaA4iqJu9xYzZiKrJh+da0xrzP 224AmQE70ns7dpvTyQ6eXzaypADSsFm0 =i+ZD -----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
