Merge lp:~smoser/ubuntu/precise/cobbler/import-fix-unknown-distros into lp:ubuntu/precise/cobbler

[Scott Moser]

[Colin Watson (cjwatson)]

Looks good to me, thanks.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-23 11:22:39 +0000
+++ debian/changelog	2012-01-25 21:39:24 +0000
@@ -1,3 +1,10 @@
+cobbler (2.2.2-0ubuntu17) UNRELEASED; urgency=low
+
+  * cobbler-ubuntu-import: fix update-existing to only update
+    distros formated as '<codename>-<arch>'
+
+ -- Scott Moser <[e-mail]>  Wed, 25 Jan 2012 16:31:51 -0500
+
 cobbler (2.2.2-0ubuntu16) precise; urgency=low
 
   * cobbler-ubuntu-import: fix bug where 'amd64' arch was not actually

=== modified file 'debian/cobbler-ubuntu-import'
--- debian/cobbler-ubuntu-import	2012-01-19 21:41:49 +0000
+++ debian/cobbler-ubuntu-import	2012-01-25 21:39:24 +0000
@@ -140,6 +140,17 @@
 	[ "$md5sum_local" != "$md5sum_remote" ]
 }
 
+# inargs(needle, haystack, ...)
+# return 0 if 'needle' == one of args $2..$#
+in_args() {
+	local cur="" needle=$1
+	shift;
+	for cur in "$@"; do
+		[ "$needle" = "$cur" ] && return 0;
+	done
+	return 1
+}
+
 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##*/}" \
@@ -179,7 +190,16 @@
 		fail "failed to get list of existing distros"
 	[ -n "$_existing" ] ||
 		fail "there were no existing distros of type ubuntu"
-	set -- $_existing
+	supported=( $(distro-info --supported) ) ||
+		fail "--update-existing requires 'distro-info'"
+	to_update=( )
+	for item in $_existing; do
+		in_args "${item%%-*}" "${supported[@]}" &&
+			in_args "${item#*-}" "i386" "x86_64" &&
+			to_update[${#to_update[@]}]=${item} ||
+			echo "$item: skipping, not <codename>-<arch>"
+	done
+	set -- "${to_update[@]}"
 fi
 [ $# -ne 0 ] || bad_Usage "must provide arguments"
 

=== modified file 'debian/control'
--- debian/control	2012-01-18 13:50:40 +0000
+++ debian/control	2012-01-25 21:39:24 +0000
@@ -29,12 +29,13 @@
  rsync,
  syslinux | syslinux-common,
  cobbler-common (= ${binary:Version})
-Recommends: hardlink,
- powerwake,
- tftpd-hpa,
- cobbler-web,
- debmirror,
- fence-agents
+Recommends: cobbler-web,
+            debmirror,
+            distro-info,
+            fence-agents,
+            hardlink,
+            powerwake,
+            tftpd-hpa
 Suggests: createrepo,
  bind9,
  dhcp3-server,