Merge lp:~gandelman-a/ubuntu/precise/cobbler/cobbler-ubuntu-import-proxy into lp:ubuntu/precise/cobbler

[Adam Gandelman]

Two minor changes to cobbler-ubuntu-import:

- There is a faulty if clause when determining whether or not to test+create the $ISO_DIR if its missing, which causes the script to later fail if for whatever reason the directory is not there.

- Adds a -p argument for specifying a proxy, which is passed to wget via http_proxy environment variable. orchestra-import-isos will be able to make use of this.

[lp:~gandelman-a/ubuntu/precise/cobbler/cobbler-ubuntu-import-proxy]

55. By Adam Gandelman on 2011-11-19

Update debian/changelog.

[Andres Rodriguez (andreserl)]

Looks good. Uploading

review: Approve

Unmerged revisions

55. By Adam Gandelman on 2011-11-19

Update debian/changelog.

54. By Adam Gandelman on 2011-11-19

debian/cobbler-ubuntu-import: Support wget'ing via a proxy via -p argument. Correct error so that $ISO_DIR actually gets created if it doesn't exist

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-17 20:40:30 +0000
+++ debian/changelog	2011-11-19 01:41:24 +0000
@@ -1,3 +1,11 @@
+cobbler (2.2.2-0ubuntu4) UNRELEASED; urgency=low
+
+  * debian/cobbler-ubuntu-import: Support wget'ing via a proxy via -p argument,
+    correct error so that $ISO_DIR actually gets created if it doesn't exist.
+    (LP: #892409)
+
+ -- Adam Gandelman <[e-mail]>  Fri, 18 Nov 2011 17:35:59 -0800
+
 cobbler (2.2.2-0ubuntu3) precise; urgency=low
 
   * debian/patches/47_ubuntu_add_codenames.patch:
 
=== modified file 'debian/cobbler-ubuntu-import'
--- debian/cobbler-ubuntu-import	2011-10-24 19:29:26 +0000
+++ debian/cobbler-ubuntu-import	2011-11-19 01:41:24 +0000
@@ -28,6 +28,7 @@
                           not exist in $ISO_DIR
       -r | --remove       remove cobbler profile/distro and cached ISO
       -u | --update	  update iso, import, replace outdated distro and profile
+      -p | --proxy	  <host[:port> http proxy to use
       -v | --verbose	  increase verbosity
    Note, arch can be i386, x86_64, or amd64.  However,
    the registered distro and profile will use 'x86_64' rather than 'amd64'.
@@ -136,7 +137,7 @@
 	[ "$md5sum_local" != "$md5sum_remote" ]
 }
 
-short_opts="Dhm:o:vcru"
+short_opts="Dhm:o:p:vcru"
 long_opts="delete-iso,help,mirror:,verbose,update-check,remove"
 getopt_out=$(getopt --name "${0##*/}" \
 	--options "${short_opts}" --long "${long_opts}" -- "$@") &&
@@ -155,6 +156,7 @@
 		-h|--help) Usage ; exit 0;;
 		-m|--mirror) mirror=${2}; shift;;
 		-D|--delete-iso) delete=true;;
+		-p|--proxy) proxy=${2}; shift;;
 		-v|--verbose) VERBOSITY=$((${VERBOSITY}+1));;
 		-c|--update-check) check_update=true;;
 		-r|--remove) remove=true;;
@@ -171,8 +173,13 @@
 	fail "failed to make tempdir"
 trap cleanup EXIT
 
+if [ -n $proxy ] ; then
+	debug "Using proxy: $proxy"
+	export http_proxy="$proxy"
+fi
+
 # program starts here
-if $delete; then
+if ! $delete; then
 	{ [ -d "$ISO_DIR" ] || mkdir -p "$ISO_DIR"; } || fail "failed to create $ISO_DIR"
 fi
 mkdir "$TEMP_D/mnt" || fail "failed to make tempdir/mnt"