Module Name: src
Committed By: riz
Date: Thu Apr 12 16:05:48 UTC 2012
Modified Files:
src/distrib/utils/sysinst: configmenu.c
Log Message:
Change the pkgin repository *before* running pkgin update. Spotted
by imil@.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/sysinst/configmenu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/configmenu.c
diff -u src/distrib/utils/sysinst/configmenu.c:1.1 src/distrib/utils/sysinst/configmenu.c:1.2
--- src/distrib/utils/sysinst/configmenu.c:1.1 Fri Apr 6 23:48:53 2012
+++ src/distrib/utils/sysinst/configmenu.c Thu Apr 12 16:05:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: configmenu.c,v 1.1 2012/04/06 23:48:53 riz Exp $ */
+/* $NetBSD: configmenu.c,v 1.2 2012/04/12 16:05:48 riz Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -258,12 +258,13 @@ set_binpkg(struct menudesc *menu, void *
return 0;
}
- run_program(RUN_DISPLAY | RUN_PROGRESS | RUN_CHROOT,
- "/usr/pkg/bin/pkgin update");
-
/* configure pkgin to use $pkgpath as a repository */
snprintf(pattern, STRSIZE, "s,^[^#].*$,%s,", pkgpath);
replace("/usr/pkg/etc/pkgin/repositories.conf", pattern);
+
+ run_program(RUN_DISPLAY | RUN_PROGRESS | RUN_CHROOT,
+ "/usr/pkg/bin/pkgin update");
+
msg_display(MSG_binpkg_installed);
process_menu(MENU_ok, NULL);
