Author: djpig
Date: 2006-02-10 14:56:15 +0000 (Fri, 10 Feb 2006)
New Revision: 100

Modified:
   trunk/ChangeLog
   trunk/debian/changelog
   trunk/scripts/dpkg-source.pl
Log:
Let dpkg-source -x touch all patched files to have the same
timestamp to mitigate time-skew problems (Denis Barbier).
Closes: #105750


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2006-02-10 14:40:46 UTC (rev 99)
+++ trunk/ChangeLog     2006-02-10 14:56:15 UTC (rev 100)
@@ -1,5 +1,12 @@
-2006-02-10  Ian Jackson <[EMAIL PROTECTED]>
+2006-02-10  Denis Barbier  <[EMAIL PROTECTED]>
 
+       * scripts/dpkg-source.pl: Touch all patched files
+       to have the same timestamp. This should mitigate
+       time-skew problems until we can finally add proper
+       timestamps to the diffs.
+
+2006-02-10  Ian Jackson  <[EMAIL PROTECTED]>
+
        * src/configure.c: Differentiate between modified
        and deleted configuration files. Gives and more
        accurate description to the user and eliminates

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2006-02-10 14:40:46 UTC (rev 99)
+++ trunk/debian/changelog      2006-02-10 14:56:15 UTC (rev 100)
@@ -44,6 +44,9 @@
     variables.
   * On package configuration, differentiate between modified and
     deleted configuration files (Ian Jackson). Closes: #351361
+  * Let dpkg-source -x touch all patched files to have the same
+    timestamp to mitigate time-skew problems (Denis Barbier).
+    Closes: #105750
 
   [ Christian Perrier ]
   * Switch to po4a for manpages translation. Closes: #320122

Modified: trunk/scripts/dpkg-source.pl
===================================================================
--- trunk/scripts/dpkg-source.pl        2006-02-10 14:40:46 UTC (rev 99)
+++ trunk/scripts/dpkg-source.pl        2006-02-10 14:56:15 UTC (rev 100)
@@ -815,8 +815,11 @@
        &reapgzip if $patch =~ /\.(gz|bz2)$/;
     }
 
+    my $now = time;
     for $fn (keys %filepatched) {
-       $ftr= "$newdirectory/".substr($fn,length($expectprefix)+1).".dpkg-orig";
+       $ftr= "$newdirectory/".substr($fn,length($expectprefix)+1);
+       utime($now, $now, $ftr) || &syserr("cannot change timestamp for $ftr");
+       $ftr.= ".dpkg-orig";
        unlink($ftr) || &syserr("remove patch backup file $ftr");
     }
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to