Merge lp:~smoser/ubuntu/precise/cobbler/improvements.cui into lp:ubuntu/precise/cobbler

[Scott Moser]

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-18 13:50:40 +0000
+++ debian/changelog	2012-01-19 21:45:33 +0000
@@ -1,3 +1,13 @@
+cobbler (2.2.2-0ubuntu16) UNRELEASED; urgency=low
+
+  * cobbler-ubuntu-import: fix bug where 'amd64' arch was not actually
+    supported.
+  * cobbler-ubuntu-import: add '--update-existing' flag for updating
+    all existin ubuntu distros.  Also fix issues where multiple 
+    codename-arch arguments were not being honored.
+
+ -- Scott Moser <[e-mail]>  Thu, 19 Jan 2012 16:31:18 -0500
+
 cobbler (2.2.2-0ubuntu15) precise; urgency=low
 
   * debian/control: Depends on virtinst for koan. (LP: #918281)

=== modified file 'debian/cobbler-ubuntu-import'
--- debian/cobbler-ubuntu-import	2012-01-05 13:24:23 +0000
+++ debian/cobbler-ubuntu-import	2012-01-19 21:45:33 +0000
@@ -27,9 +27,11 @@
                           mirror.  exits 0 if an update is needed or iso does
                           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
+      -u | --update       update iso, import, replace outdated distro and profile
+      -U | --update-existing
+                          update all existing ubuntu distros in cobbler
+      -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'.
    This is to keep consistent with cobbler naming.
@@ -138,8 +140,8 @@
 	[ "$md5sum_local" != "$md5sum_remote" ]
 }
 
-short_opts="Dhm:o:p:vcru"
-long_opts="delete-iso,help,mirror:,proxy:,remove,update,update-check,remove,verbose"
+short_opts="Dhm:o:p:vcruU"
+long_opts="delete-iso,help,mirror:,proxy:,remove,update,update-existing,update-check,remove,verbose"
 getopt_out=$(getopt --name "${0##*/}" \
 	--options "${short_opts}" --long "${long_opts}" -- "$@") &&
 	eval set -- "${getopt_out}" ||
@@ -147,6 +149,7 @@
 
 delete=false
 check_update=false
+update_existing=0
 remove=false
 mirror=${DEFAULT_MIRROR}
 do_update=false
@@ -162,12 +165,22 @@
 		-c|--update-check) check_update=true;;
 		-r|--remove) remove=true;;
 		-u|--update) do_update=true;;
+		-u|--update-existing) do_update=true; update_existing=1;;
 		--) shift; break;;
 	esac
 	shift;
 done
 
 ## check arguments here
+if [ $update_existing -eq 1 ]; then
+	[ $# -eq 0 ] ||
+		bad_Usage "do not provide arguments with update-existing"
+	_existing=$(cobbler distro find --breed=ubuntu) ||
+		fail "failed to get list of existing distros"
+	[ -n "$_existing" ] ||
+		fail "there were no existing distros of type ubuntu"
+	set -- $_existing
+fi
 [ $# -ne 0 ] || bad_Usage "must provide arguments"
 
 TEMP_D=$(mktemp -d "${TMPDIR:-/tmp}/${0##*/}.XXXXXX") ||
@@ -185,10 +198,12 @@
 fi
 mkdir "$TEMP_D/mnt" || fail "failed to make tempdir/mnt"
 
+updates_needed=0
+
 for tok in "$@"; do
 	REL=${tok%-*}; ARCH=${tok#*-}
 	[ "$ARCH" = "amd64" ] && 
-		{ error "Warning: using x86_64 for arch rather than amd64"; arch="x86_64"; }
+		{ error "Warning: using x86_64 for arch rather than amd64"; ARCH="x86_64"; }
 	ubuntu_arch=$ARCH; [ "$ARCH" = "x86_64" ] && ubuntu_arch=amd64
 	ISO=$REL-$ARCH-mini.iso
 	U=$mirror/dists/$REL/main/installer-$ubuntu_arch/current/images/netboot/mini.iso
@@ -206,21 +221,31 @@
 			cobbler distro remove --name="$REL-$ARCH" ||
 				fail "Could not remove cobbler profile for $REL-$ARCH"
 		fi
-		exit 0
+		continue
 	fi
 	if $check_update; then
-		update_available && echo "Update for $REL-$ARCH available" && exit 0
-		echo "$ISO_DIR/$ISO up to date." && exit 3
+		if update_available; then
+			echo "$REL-$ARCH: Update available"
+			updates_needed=$(($updates_needed+1));
+		else
+			echo "$REL-$ARCH: Up to date"
+		fi
+		continue
 	fi
 	if $do_update; then
-		update_available || fail "No update available"
+		update_available ||
+			{ echo "$REL-$ARCH: no update available"; continue; }
 		# get iso from either pocket and import it with a tmp name.
 		get_iso && import_iso "tmp-$REL-$ARCH"
 		reassign_distro "tmp-$REL-$ARCH" "$REL-$ARCH"
-		exit 0
+		continue
 	fi
 	[[ ! -f "$ISO_DIR/$ISO" ]] && get_iso
-	import_iso "$REL-$ARCH" && echo "imported $REL-$ARCH"
+	import_iso "$REL-$ARCH" && echo "$REL-$ARCH: imported"
 done
 
+if $check_update; then
+	[ $updates_needed -eq 0 ] && exit 3
+fi
+
 # vi: ts=4 noexpandtab