The following commit has been merged in the master branch:
commit 5e06c4d24b57aa2af3fd71a0f1c7cb987bf8a74e
Author: Benjamin Drung <[email protected]>
Date: Sun Feb 17 18:15:19 2013 +0100
debchange, debcommit: Set the timestamp of temporary editor files back one
second
Set the timestamp of temporary editor files back one second, to make
modification detection more reliable in the absence of subsecond
granularity.
Closes: #697923
diff --git a/debian/changelog b/debian/changelog
index 69ef384..d7bb513 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,8 +43,6 @@ devscripts (2.13.0) UNRELEASED; urgency=low
[ Benjamin Drung ]
* Add bashism test cases from Raphael Geissert.
* Add autopkgtest support. (LP: #1073330)
- * debian/control: Mark devscripts Multi-Arch: foreign.
- Thanks to Colin Watson. (Closes: #694760)
* suspicious-source: Add inode/symlink and image/x-xpmi to whitelisted
mime-types.
* wrap-and-sort:
@@ -87,6 +85,12 @@ devscripts (2.13.0) UNRELEASED; urgency=low
* wnpp-alert: Support using curl as alternative to wget. (Closes: #690056)
* wnpp-check: Support using curl as alternative to wget. (Closes: #690059)
+ [ Colin Watson ]
+ * debian/control: Mark devscripts Multi-Arch: foreign. (Closes: #694760)
+ * debchange, debcommit: Set the timestamp of temporary editor files back
+ one second, to make modification detection more reliable in the absence
+ of subsecond granularity. (Closes: #697923)
+
-- James McCoy <[email protected]> Sat, 15 Sep 2012 16:12:16 -0400
devscripts (2.12.6) unstable; urgency=low
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index a5c3936..923ef99 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -1563,6 +1563,8 @@ if ((!$TEXT and !$EMPTY_TEXT and ! ($opt_create and
$opt_empty)) or @closes_text
my $mtime = (stat("$changelog_path.dch"))[9];
defined $mtime or fatal
"Error getting modification time of temporary $changelog_path: $!";
+ $mtime--;
+ utime $mtime, $mtime, "$changelog_path.dch";
system("sensible-editor +$line $changelog_path.dch") == 0 or
fatal "Error editing $changelog_path";
diff --git a/scripts/debcommit.pl b/scripts/debcommit.pl
index 902d0b2..0a853ad 100755
--- a/scripts/debcommit.pl
+++ b/scripts/debcommit.pl
@@ -830,6 +830,8 @@ sub edit {
$fh->close();
my $mtime = (stat("$fh"))[9];
defined $mtime || die "$progname: unable to retrieve modification time for
temporary file: $!\n";
+ $mtime--;
+ utime $mtime, $mtime, $fh->filename;
system("sensible-editor $fh");
open(FH, '<', "$fh") || die "$progname: unable to open temporary file for
reading\n";
$message = "";
--
Git repository for devscripts
_______________________________________________
devscripts-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
