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

[Adam Gandelman]

This changes the reassign_distro() function to preserve *all* profiles associated with a distro, instead of preserving only the profile with a matching name.

Previously, when importing a new 'precise-i386' distro, only the profile named 'precise-i386' and any child profiles of the 'precise-i386' were preserved. With this change, 'cobbler profile --find=$distro' is used to find all descendant profiles and reassign accordingly to ensure they are preserved across updates.

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-24 14:00:01 +0000
+++ debian/changelog	2011-12-07 00:33:28 +0000
@@ -1,3 +1,11 @@
+cobbler (2.2.2-0ubuntu7) precise; urgency=low
+
+  * debian/cobbler-ubuntu-import: On distro import, also reassign *all*
+    descendent profiles not just Orchestra-specific profiles (ie, $rel-$arch).
+    Preserves user-added profiles associated with updated distros (LP: #900977)
+
+ -- Adam Gandelman <[e-mail]>  Tue, 06 Dec 2011 16:18:21 -0800
+
 cobbler (2.2.2-0ubuntu6) precise; urgency=low
 
   * Fix typo in cobbler-common.install which caused the gpxe template to be

=== modified file 'debian/cobbler-ubuntu-import'
--- debian/cobbler-ubuntu-import	2011-11-22 15:36:38 +0000
+++ debian/cobbler-ubuntu-import	2011-12-07 00:33:28 +0000
@@ -91,30 +91,31 @@
 }
 
 reassign_distro() {
-	# swap out backing distro of profile with a newer, imported
-	# distro. after, remove the original and rename the new distro
-	# to match the previous distro name associated with profile
+	# expected to be called after get_iso() has imported a more up to date iso under
+	# a temporary name. this will reassign all profiles associated with $old_distro
+	# with $new_distro.  after all profiles have been reassigned, $old_distro is
+	# removed.
 	local new_distro="$1"
-	local profile="$2"
-	debug "Reassigning $profile to $new_distro"
-	if ! cobbler profile list | grep -qs " $profile"; then
-		fail "cannot reassign non-existent profile '$profile'"
-	fi
-	if ! cobbler distro list | grep -qs " $profile"; then
-		fail "distro matching profile '$profile' does not exist"
-	fi
-	debug "Renaming old profile '$profile' to 'last-$profile'"
-	cobbler distro rename --name="$profile" --newname="last-$profile" ||
-		fail "could not rename distro '$profile' to 'last-$profile'"
-	debug "Assigning profile $profile to distro $new_distro"
-	cobbler profile edit --name="$profile" --distro="$new_distro" ||
-		fail "could not assign profile '$profile' to distro '$new_distro'"
-	debug "Removing distro last-$profile"
-	cobbler distro remove --name="last-$profile" ||
-		fail "could not remove stale distro 'last-$profile'"
-	debug "Renaming distro $new_distro to $profile"
-	cobbler distro rename --name="$new_distro" --newname="$profile" ||
-		fail "could not rename distro '$new_distro' to '$profile'"
+	local old_distro="$2"
+	descendants=`cobbler profile find --distro="$old_distro"`
+	debug "Reassigning $old_distro to $new_distro"
+	if ! cobbler distro list | grep -qs " $old_distro"; then
+		fail "distro matching profile '$old_distro' does not exist"
+	fi
+	debug "Renaming old distro '$old_distro' to 'last-$old_distro'"
+	cobbler distro rename --name="$old_distro" --newname="last-$old_distro" ||
+		fail "could not rename distro '$old_distro' to 'last-$old_distro'"
+	for profile in $descendants ; do
+		debug "Assigning profile $profile to distro $new_distro"
+		cobbler profile edit --name="$profile" --distro="$new_distro" ||
+			fail "could not assign profile '$profile' to distro '$new_distro'"
+	done
+	debug "Removing distro last-$old_distro"
+	cobbler distro remove --name="last-$old_distro" ||
+		fail "could not remove stale distro 'last-$old_distro'"
+	debug "Renaming distro $new_distro to $old_distro"
+	cobbler distro rename --name="$new_distro" --newname="$old_distro" ||
+		fail "could not rename distro '$new_distro' to '$old_distro'"
 	debug "Cleaning up temporary profile '$new_distro'"
 	cobbler profile remove --name="$new_distro" ||
 		fail "could not remove temp profile '$new_distro'"