[d-i-commits] r32223 - in trunk/packages/main-menu: . debian

[Joey Hess]

Author: joeyh
Date: 2005-11-17 19:59:49 +0000 (Thu, 17 Nov 2005)
New Revision: 32223

Modified:
   trunk/packages/main-menu/debian/changelog
   trunk/packages/main-menu/main-menu.c
Log:
* If a default menu item cannot be determined, drop priority to avoid
  looping.

Modified: trunk/packages/main-menu/debian/changelog
===================================================================
--- trunk/packages/main-menu/debian/changelog	2005-11-17 19:59:40 UTC (rev 32222)
+++ trunk/packages/main-menu/debian/changelog	2005-11-17 19:59:49 UTC (rev 32223)
@@ -1,3 +1,10 @@
+main-menu (1.10) UNRELEASED; urgency=low
+
+  * If a default menu item cannot be determined, drop priority to avoid
+    looping.
+
+ -- Joey Hess <joeyh at debian.org>  Thu, 17 Nov 2005 14:15:40 -0500
+
 main-menu (1.09) unstable; urgency=low
 
   * Avoid trailing commas at end of missing-provide choices list since

Modified: trunk/packages/main-menu/main-menu.c
===================================================================
--- trunk/packages/main-menu/main-menu.c	2005-11-17 19:59:40 UTC (rev 32222)
+++ trunk/packages/main-menu/main-menu.c	2005-11-17 19:59:49 UTC (rev 32223)
@@ -232,6 +232,10 @@
 		menu_entry(debconf, menudefault, buf, sizeof (buf));
 		debconf_set(debconf, MAIN_MENU, buf);
 	}
+	else {
+		di_log(DI_LOG_LEVEL_INFO, "no default menu item"); 
+		modify_debconf_priority(LOWER);
+	}
 	debconf_input(debconf, MENU_PRIORITY, MAIN_MENU);
 	debconf_go(debconf);
 	debconf_get(debconf, MAIN_MENU);