[SCM] Git repository for devscripts branch, master, updated. v2.11.9-6-gb33fc0b

James McCoy jamessan at debian.org
Fri Jun 29 04:04:51 UTC 2012


The following commit has been merged in the master branch:
commit b33fc0be2a93333cf25e7f3d398bf376645d81bf
Author: James McCoy <jamessan at debian.org>
Date:   Thu Jun 28 23:58:08 2012 -0400

    rc-alert: Unset wget's continue option
    
    If a user has "continue = on" in their wgetrc, then when wget determines the
    remote file needs to be downloaded, it will only download enough to make up
    the file size  difference.  This results in an invalid cached bug list.
    Disabling continue ensures that when a download happens, the entire file is
    downloaded.
    
    Closes: #677229
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 3710d6f..456b283 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ devscripts (2.11.10) UNRELEASED; urgency=low
   * dscverify: Use GetOptions to handle argument parsing.  (Closes: #679148)
   * uscan: Properly use the File::Temp interface so files aren't being created
     with the stringified version of a file glob.  (Closes: #678193)
+  * rc-alert: Unset wget's continue option to ensure the bug list is properly
+    downloaded.  (Closes: #677229)
 
  -- Benjamin Drung <bdrung at debian.org>  Sun, 17 Jun 2012 23:33:41 +0200
 
diff --git a/scripts/rc-alert.pl b/scripts/rc-alert.pl
index a98e5d0..d6d0bf4 100755
--- a/scripts/rc-alert.pl
+++ b/scripts/rc-alert.pl
@@ -171,7 +171,9 @@ if (! -d $cachedir and $forcecache) {
 if (-d $cachedir) {
     chdir $cachedir or die "$progname: can't cd $cachedir: $!\n";
 
-    if (system("wget -qN $url") != 0) {
+    # Either use the cached version because the remote hasn't been updated
+    # (-N) or download a complete new copy (--no-continue)
+    if (system('wget', '-qN', '--no-continue', $url) != 0) {
 	die "$progname: wget failed!\n";
     }
     open BUGS, $cachefile or die "$progname: could not read $cachefile: $!\n";

-- 
Git repository for devscripts



More information about the devscripts-devel mailing list