Browse Source

- Don't default to packages which are 'earlier' than the last

successfully configured package that has a value of less
  than 900 (any higher are the packages that never get defaulted
  to.), closes: #224633
- Add self to Uploaders.

r10124
keep-around/c8703c509368e1805e513d61f98a9d17d2cdd9cc
Joshua Kwan [obsolete] 19 years ago
parent
commit
cd0e7e9226
  1. 11
      debian/changelog
  2. 2
      debian/control
  3. 18
      main-menu.c

11
debian/changelog

@ -1,3 +1,14 @@
main-menu (0.059) unstable; urgency=low
* Joshua Kwan
- Don't default to packages which are 'earlier' than the last
successfully configured package that has a value of less
than 900 (any higher are the packages that never get defaulted
to.), closes: #224633
- Add self to Uploaders.
-- Joshua Kwan <joshk@triplehelix.org> Mon, 8 Mar 2004 18:27:12 -0800
main-menu (0.058) unstable; urgency=low
* Translations

2
debian/control

@ -2,7 +2,7 @@ Source: main-menu
Section: debian-installer
Priority: standard
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Uploaders: Joey Hess <joeyh@debian.org>, Martin Sjogren <sjogren@debian.org>, Petter Reinholdtsen <pere@debian.org>, Matt Kraai <kraai@debian.org>
Uploaders: Joey Hess <joeyh@debian.org>, Martin Sjogren <sjogren@debian.org>, Petter Reinholdtsen <pere@debian.org>, Matt Kraai <kraai@debian.org>, Joshua Kwan <joshk@triplehelix.org>
Build-Depends: debhelper (>= 4.2), dpkg-dev (>= 1.9), libdebconfclient0-dev (>= 0.47), libdebian-installer4-dev (>= 0.18), po-debconf (>= 0.5.0)
Package: main-menu

18
main-menu.c

@ -29,6 +29,8 @@
const int RAISE = 1;
const int LOWER = 0;
int last_successful_item = -1;
/* Save default priority, to be able to return to it when we have to lower it */
int default_priority = 1;
@ -106,6 +108,9 @@ get_default_menu_item(di_slist *list)
p->p.status == di_package_status_installed ||
!isinstallable(p))
continue;
if (p->installer_menu_item < last_successful_item &&
p->installer_menu_item < 900)
continue;
/* If menutest says this item should be default, make it so */
if (!isdefault(p))
continue;
@ -566,7 +571,18 @@ int main (int argc __attribute__ ((unused)), char **argv) {
modify_debconf_priority(LOWER);
}
else
modify_debconf_priority(RAISE);
{
/* Success */
modify_debconf_priority(RAISE);
if (p->installer_menu_item < 900)
{
last_successful_item = p->installer_menu_item;
di_log(DI_LOG_LEVEL_DEBUG, "Installed package '%s', raising last_successful_item to %d", p->p.package, p->installer_menu_item);
}
else
di_log(DI_LOG_LEVEL_DEBUG, "Installed package '%s' but no raise since %d >= 900", p->p.package, p->installer_menu_item);
}
di_packages_free (packages);
di_packages_allocator_free (allocator);

Loading…
Cancel
Save