Yeah! Thanks a lot for the patch, Marc. I noticed that quilt begun recently to leave files in /tmp but didn't find the time to investiguate. I'll integrate your patch very soon.
Thanks again, Mt. On Thu, Feb 28, 2013 at 03:35:28PM -0500, Marc Deslauriers wrote: > Package: quilt > Version: 0.60-7 > Severity: normal > Tags: patch > User: ubuntu-de...@lists.ubuntu.com > Usertags: origin-ubuntu raring ubuntu-patch > > > > *** /tmp/tmprMnRKR/bug_body > > The push_timeskew patch leaves behind temp files in /tmp when > quilt push is used. > > In Ubuntu, the attached patch was applied to achieve the following: > > * d/p/push_timeskew: updated to properly remove temp files. > > > Thanks for considering the patch. > > > -- System Information: > Debian Release: wheezy/sid > APT prefers raring-updates > APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, > 'raring'), (100, 'raring-backports') > Architecture: amd64 (x86_64) > Foreign Architectures: i386 > > Kernel: Linux 3.8.0-8-generic (SMP w/4 CPU cores) > Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) > Shell: /bin/sh linked to /bin/dash > diff -Nru quilt-0.60/debian/changelog quilt-0.60/debian/changelog > diff -Nru quilt-0.60/debian/patches/push_timeskew > quilt-0.60/debian/patches/push_timeskew > --- quilt-0.60/debian/patches/push_timeskew 2013-01-05 06:34:43.000000000 > -0500 > +++ quilt-0.60/debian/patches/push_timeskew 2013-02-28 15:22:44.000000000 > -0500 > @@ -6,11 +6,12 @@ > context information. > Bug-Debian: http://bugs.debian.org/466360 > Upstream-status: to be submitted > +Last-Update: 2013-02-28 > > -Index: quilt.git/quilt/push.in > +Index: quilt-0.60/quilt/push.in > =================================================================== > ---- quilt.git.orig/quilt/push.in 2012-12-31 10:09:56.144582064 +0100 > -+++ quilt.git/quilt/push.in 2012-12-31 11:25:52.967442800 +0100 > +--- quilt-0.60.orig/quilt/push.in 2013-02-28 15:19:19.583338843 -0500 > ++++ quilt-0.60/quilt/push.in 2013-02-28 15:20:14.587340251 -0500 > @@ -30,7 +30,8 @@ > specified number of patches. When a patch name is specified, apply > all patches up to and including the specified patch. Patch names may > @@ -21,7 +22,7 @@ > > -a Apply all patches in the series file. > > -@@ -208,18 +209,27 @@ > +@@ -208,18 +209,29 @@ > touch $QUILT_PC/$patch~refresh > fi > > @@ -43,6 +44,8 @@ > + if [ -s "$NONEMPTY_FILES" ]; then > + xargs -0 touch -c -r "$QUILT_PC/$patch/.timestamp" < > "$NONEMPTY_FILES" > + fi > ++ > ++ rm -f $NONEMPTY_FILES > > if ! [ -e $patch_file ] > then > @@ -53,10 +56,10 @@ > then > printf $"Patch %s appears to be empty; applied\n" \ > "$(print_patch $patch)" > -Index: quilt.git/quilt/scripts/backup-files.in > +Index: quilt-0.60/quilt/scripts/backup-files.in > =================================================================== > ---- quilt.git.orig/quilt/scripts/backup-files.in 2012-12-25 > 14:18:07.454999925 +0100 > -+++ quilt.git/quilt/scripts/backup-files.in 2012-12-31 11:12:25.158163110 > +0100 > +--- quilt-0.60.orig/quilt/scripts/backup-files.in 2013-02-28 > 15:19:19.583338843 -0500 > ++++ quilt-0.60/quilt/scripts/backup-files.in 2013-02-28 15:19:19.575338842 > -0500 > @@ -181,8 +181,9 @@ > done < "$NONEMPTY_FILES" > fi > @@ -68,10 +71,10 @@ > fi > fi > > -Index: quilt.git/test/push_timeskew.test > +Index: quilt-0.60/test/push_timeskew.test > =================================================================== > --- /dev/null 1970-01-01 00:00:00.000000000 +0000 > -+++ quilt.git/test/push_timeskew.test 2012-12-31 12:01:47.978999172 > +0100 > ++++ quilt-0.60/test/push_timeskew.test 2013-02-28 15:19:19.575338842 > -0500 > @@ -0,0 +1,86 @@ > +This test enforces that files touched by a patch have the exact same > +mtime when pushing and poping the patch. -- La joie d'apprendre est aussi indispensable aux études que la respiration aux coureurs. -- Maria Montessori -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
