Merge lp:~ara/ubuntu-qa-tools/fix_dl_ubuntu_test_iso into lp:ubuntu-qa-tools

[Ara Pulido]

Steve,

Some of your changes didn't work for me. I have made some changes to it. Can you review them ASAP, please?

 * BASEURL was not working, as it includes rsync://, but, as it is not used anymore, it is ignored now.
 * USERNAME/PASSWORD were interfering with USERNAME shell variable, and, therefore, always failing. Changed those to DLUSERNAME/DLPASSWORD
 * The man page needed an update

[Steve Beattie (sbeattie)]

Thanks, Ara, merged. I did modify it slightly to warn when BASEURL is specified, so that people setting it would know that it's not going to be honored.

[Steve Beattie (sbeattie)]

review: Approve

=== modified file 'dl-ubuntu-test-iso/dl-ubuntu-test-iso'
--- dl-ubuntu-test-iso/dl-ubuntu-test-iso	2010-04-13 06:08:12 +0000
+++ dl-ubuntu-test-iso/dl-ubuntu-test-iso	2010-04-13 12:40:36 +0000
@@ -456,14 +456,13 @@
         return None
 
     shell_vars = ['ISOROOT', 'RELEASES', 'FLAVORS', 'VARIANTS', 'EXCLUDE',
-                  'OPTS', 'QUIET', 'NO_ACT', 'VERIFY', 'BUILD', 'BASEURL',
-                  'ARCHS', 'USERNAME', 'PASSWORD', 'HOST']
+                  'OPTS', 'QUIET', 'NO_ACT', 'VERIFY', 'BUILD','ARCHS', 
+                  'DLUSERNAME', 'DLPASSWORD', 'HOST']
     command = ". %s; " %(pathname)
     for var in shell_vars:
         command += 'if [ ! -z "$%s" ] ; then echo %s=$%s; fi ; ' %(var, var, var)
     p = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE)
     out, err = p.communicate()
-
     config = dict()
     for line in re.split('\n', out):
         l = re.split('=', line)
@@ -472,11 +471,11 @@
         if l[0] in ['RELEASES', 'FLAVORS', 'VARIANTS', 'EXCLUDE']:
             l[1] = l[1].lower()
             config[str.lower(l[0])] = re.split(' ', l[1])
-        elif l[0] in ['BASEURL', 'HOST']:
-            # XXX convert rsync:// to host
+        elif l[0] in ['HOST']:
             config['host'] = l[1]
         else:
             config[str.lower(l[0])] = l[1]
+    
     return config
 
 def merge_config(cval, file, default, value):
@@ -575,11 +574,11 @@
     if config.host == default['host'] and file_cfg != None and 'host' in file_cfg.keys():
         config.host = file_cfg['host']
 
-    if not config.username and file_cfg != None and 'username' in file_cfg.keys():
-        config.username = file_cfg['username']
+    if not config.username and file_cfg != None and 'dlusername' in file_cfg.keys():
+        config.username = file_cfg['dlusername']
 
-    if not config.password and file_cfg != None and 'password' in file_cfg.keys():
-        config.password = file_cfg['password']
+    if not config.password and file_cfg != None and 'dlpassword' in file_cfg.keys():
+        config.password = file_cfg['dlpassword']
 
     if (config.username or config.password):
         if (config.username and config.password):

=== modified file 'doc/dl-ubuntu-test-iso.1'
--- doc/dl-ubuntu-test-iso.1	2009-01-29 10:54:38 +0000
+++ doc/dl-ubuntu-test-iso.1	2010-04-13 12:40:36 +0000
@@ -20,7 +20,6 @@
 
 You can put a configuration file (~/.dl\-ubuntu\-test\-iso) and set some variables
 to limit what will be downloaded.
-See sample values below.
 
    * ARCHS: what architectures to download
    * FLAVORS: what flavors of Ubuntu? Ubuntu itself, Kubuntu, etc
@@ -30,6 +29,9 @@
 
 You can get sample configuration files at /usr/share/doc/ubuntu\-qa\-tools/examples/
 
+The script should honor http_proxy settings, with the exception of
+rsync if the rsync mechanism is used.
+
 .SH OPTIONS
 Listed below are the command line options for \fBdl\-ubuntu\-test\-iso\fR:
 .TP
@@ -63,6 +65,77 @@
 Only download a specific release target of Ubuntu. Only the last
 \-\-release option applies. (You can also set RELEASES in the
 configuration file.) "hardy" is the earliest release target
+.TP
+.B \-\-variant variant 
+Only download a specific variant of Ubuntu (e.g. dekstop,
+alternate, server, dvd). The \-\-variant option can be given
+multiple times to specify than one variant.
+.TP
+.B \-\-arch arch
+Only download a specific architecture of Ubuntu (e.g. i386,
+amd64). The \-\-arch option can be given multiple times to request
+more than one arch.
+.TP
+.B \-\-bwlimit=KBPS
+This option allows you to specify a maximum transfer rate in
+kilobytes per second; equivalent to adding the same argument to
+the OPTS variable to be passed on to rsync(1). Note that zsync
+does not support bandwidth limiting.
+.TP
+.B \-\-no-verify
+This option tells the script to skip the hash comparison check
+against the MD5SUMS file that is normally done by default.
+.TP
+.B \-\-no-zsync
+By default, the script will attempt to use zsync if it is
+available as it uses fewer resources on the cdimage server.
+However, because it does not do rate-limiting and has other
+limitations, using only rsync may be preferred.
+.TP
+.B \-\-isoroot directory
+The local path underneath which the downloaded isos should be
+stored. The default is ${HOME}/iso.
+.TP
+.B \-\-config config
+Specify an alternate location for the config file; the default
+is ${HOME}/.dl-ubuntu-test-iso.
+.TP
+.B \-\-host hostname
+The mirror to pull the cdimages from. The default is
+cdimages.ubuntu.com.
+.TP
+.B \-\-user username
+If http_auth is used on the cdimage server, specify the username
+with the \-\-user argument. You can also set USERNAME in the
+config file.
+.TP
+.B \-\-pass password
+If http_auth is used on the cdimage server, specify the password
+with the \-\-pass argument. You can also set PASSWORD in the
+config file; note however that zsync does not support reading
+from a configuration file and thus any specified password will
+appear on zsync's command line and be visible in process
+listings.
+.TP
+.B \-\-mirror
+If set, the script will attempt to mimic the layout of the
+cdimage server. This is useful for republishing the isos in an
+alternate mirror.
+.TP
+.B \-\-no-release-check
+By default, the script will query launchpad.net to see if the
+development version of ubuntu has changed (e.g. lucid ->
+maverick) and attempt to take the change into account. Adding
+this argument disables the check.
+.TP
+.B \-\-build builddate
+Tell the script to downoad a specific build date rather than the
+current iso; default is "current"
+.TP
+.B \-\-versions
+Report the version information contained within all of the isos
+in the ${HOME}/iso/ subdirectories, including the build number.
+(requires the isoinfo binary to be installed)
 
 .SH AUTHORS
 \fBdl\-ubuntu\-test\-iso\fR was written by Dave Morlay <[e-mail]>,
@@ -72,4 +145,4 @@
 This is released under the terms of the GNU General Public License, version 3.
 
 .SH SEE ALSO 
-.B rsync(1)
+.B rsync(1), zsync(1)

=== modified file 'examples/dl-ubuntu-test-iso.sample-cfg'
--- examples/dl-ubuntu-test-iso.sample-cfg	2010-04-13 06:47:11 +0000
+++ examples/dl-ubuntu-test-iso.sample-cfg	2010-04-13 12:40:36 +0000
@@ -1,9 +1,6 @@
 # Sample .dl-ubuntu-test-iso.cfg file. The included settings are the
 # default for the script
 #
-#    BASEURL The server from which to download. This is the cdimage
-#    server that Canonical operates for Ubuntu development.
-BASEURL="rsync://cdimage.ubuntu.com/cdimage"
 
 #    RELEASES
 #	Which releases of Ubuntu to target. Hardy and Lucid are the
@@ -61,17 +58,17 @@
 #        default
 HOST="cdimages.ubuntu.com"
 
-#    USERNAME
+#    DLUSERNAME
 #	If http_auth is used on the cdimage server, specify the username
 #
 # Example
-# USERNAME="ubuntu"
+# DLUSERNAME="ubuntu"
 
-#    PASSWORD
+#    DLPASSWORD
 #	If http_auth is used on the cdimage server, specify the
 #	password. Note that zsync does not support a configuration file,
 #	and so the script must pass this password on the command line,
 #	exposing it to anything that views process listings.
 #
 # Example
-# PASSWORD="ubuntu"
+# DLPASSWORD="ubuntu"