[patch] antoerh update

dialogfe.py.diff (text/plain), 4.61 KB, created by Scott Zahn on 2005-03-25 13:52:35 UTC

--- installer/src/fe/dialog/dialogfe.py	Thu Mar 24 17:39:55 2005
+++ installer2/src/fe/dialog/dialogfe.py	Fri Mar 25 11:22:55 2005
@@ -189,7 +189,7 @@
 			install_profile.set_grp_install(None, True, None)
 		install_profile.set_install_stage(None, install_stage, None)
 	tarball_options = ("Use Local", "Specify URI")
-	code, tarball_option = d.menu("Select a local stage " + install_stage + " tarball or manually specify a URI?", choices=dmenu_list_to_choices(tarball_options))
+	code, tarball_option = d.menu("Select a local stage " + install_stage + " tarball or manually specify a URI:", choices=dmenu_list_to_choices(tarball_options))
 	if code == DLG_OK:
 		tarball_option = tarball_options[int(tarball_option)-1]
 		if tarball_option == "Use Local":
@@ -199,34 +199,57 @@
 				local_tarballs.sort()
 				code, stage_tarball = d.menu("Select a local tarball:", choices=dmenu_list_to_choices(local_tarballs))
 				if code != DLG_OK: return
+				stage_tarball = local_tarballs[int(stage_tarball)-1]
 			else:
 				d.msgbox("There don't seem to be any local tarballs available.  Hit OK to manually specify a URI.")
 				tarball_option = "Specify URI"
 		if tarball_option != "Use Local": 
 			code, stage_tarball = d.inputbox("Specify the stage tarball URI or local file:", init=install_profile.get_stage_tarball_uri())
-
 	try:
-		if code == DLG_OK: install_profile.set_stage_tarball_uri(None, stage_tarball, None)
+		if code == DLG_OK:
+			if stage_tarball: install_profile.set_stage_tarball_uri(None, stage_tarball, None)
+			else: d.msgbox("No URI was specified!")
 	except:
-		d.msgbox("The specified URI is invalid")
+		d.msgbox("Specified URI is invalid!")
+		#if d.yesno("The specified URI is invalid. Use it anyway?") == DLG_YES: install_profile.set_stage_tarball_uri(None, stage_tarball, None)
 
 def set_portage_tree():
 # This section will ask whether to sync the tree, whether to use a snapshot, etc.
-	menulist = ["Normal 'emerge sync'", "Webrsync (rsync is firewalled)", "None (snapshot or NFS mount)"]
+	menulist = ["Normal 'emerge sync'", "Webrsync (rsync is firewalled)", "None (local snapshot or NFS mount)"]
 	code, portage_tree_sync = d.menu("How do you want to sync the portage tree?", choices=dmenu_list_to_choices(menulist))
 	if code != DLG_OK: return
 	portage_tree_sync = menulist[int(portage_tree_sync)-1]
 	#FIX ME when python 2.4 comes out.
 	if portage_tree_sync == "Normal 'emerge sync'": install_profile.set_portage_tree_sync_type(None, "sync", None)
 	if portage_tree_sync == "Webrsync (rsync is firewalled)": install_profile.set_portage_tree_sync_type(None, "webrsync", None)
-	if portage_tree_sync == "None (snapshot or NFS mount)": install_profile.set_portage_tree_sync_type(None, "custom", None)
-	if portage_tree_sync == "None (snapshot or NFS mount)":
-		if d.yesno("Do you want to use a portage tree snapshot?") == DLG_YES:
+	if portage_tree_sync == "None (local snapshot or NFS mount)":
+		install_profile.set_portage_tree_sync_type(None, "custom", None)		
+		snapshot_options = ("Use Local", "Specify URI")
+		code, snapshot_option = d.menu("Select a local portage snapshot or manually specify a location:", choices=dmenu_list_to_choices(snapshot_options))
+		snapshot_option = snapshot_options[int(snapshot_option)-1]
+		if snapshot_option == "Use Local":
+			snapshot_dir = "/mnt/cdrom/snapshots"
+			if os.path.isdir(snapshot_dir) and os.listdir(stages_dir):
+				local_snapshots = glob.glob(snapshot_dir + "/portage*.bz2")
+				if len(local_snapshots) == 1:
+					snapshot = local_snapshots[0]
+				else:
+					local_snapshots.sort()
+					code, snapshot = d.menu("Select a local portage snapshot:", choices=dmenu_list_to_choices(local_snapshots))
+					if code != DLG_OK: return
+					snapshot = local_snapshots[int(snapshot)-1]
+			else:
+				d.msgbox("There don't seem to be any local portage snapshots available.  Hit OK to manually specify a URI.")
+				snapshot_option = "Specify URI"
+		if snapshot_option != "Use Local":
 			code, snapshot = d.inputbox("Enter portage tree snapshot URI", init=install_profile.get_portage_tree_snapshot_uri())
-			try:
-				if code == DLG_OK: install_profile.set_portage_tree_snapshot_uri(None, snapshot, None)
-			except:
-				d.msgbox("The specified URI is invalid")
+		try:
+			if code == DLG_OK:
+				if snapshot: install_profile.set_portage_tree_snapshot_uri(None, snapshot, None)
+				else: d.msgbox("No URI was specified!")
+		except:
+			d.msgbox("Specified URI is invalid!")
+			#if d.yesno("The specified URI is invalid. Use it anyway?") == DLG_YES: install_profile.set_stage_tarball_uri(None, stage_tarball, None)
 
 def set_make_conf():
 # This section will be for setting things like CFLAGS, ACCEPT_KEYWORDS, and USE