Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11910
Modified Files:
ChangeLog Engine.pm
Log Message:
revised "switch debs during long builds" code
Index: Engine.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Engine.pm,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -d -r1.290 -r1.291
--- Engine.pm 26 Jul 2005 22:01:11 -0000 1.290
+++ Engine.pm 28 Jul 2005 17:09:44 -0000 1.291
@@ -2116,15 +2116,14 @@
# check dependencies
foreach $dep (@extendeddeps) {
next PACKAGELOOP if (($dep->[FLAG] & 2) == 0);
- ### FIXME switch debs during long builds
+ ### switch debs during long builds
if (!$dep->[PKGVER]->is_installed()) {
- ### Guess we should build/install it
then
- my $prompt = "To continue
".$dep->[PKGNAME]." is required, do you want to install it now?";
- my $continue = prompt_boolean($prompt,
default => 1, timeout => 60);
- if ($continue) {
+ ### If the deb exists, we install it
without asking.
+ ### If it doesn't exist, we allow the
process to continue
+ ### (it will quit with an error, and
the user must then
+ ### start over)
+ if ($dep->[PKGVER]->is_present()) {
&real_install($OP_INSTALL, 0,
1, $dryrun, $dep->[PKGVER]->get_name());
- } else {
- die "Failed to switch in
".$dep->[PKGNAME]."!\n";
}
}
}
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1068
retrieving revision 1.1069
diff -u -d -r1.1068 -r1.1069
--- ChangeLog 28 Jul 2005 15:14:09 -0000 1.1068
+++ ChangeLog 28 Jul 2005 17:09:43 -0000 1.1069
@@ -1,3 +1,10 @@
+2005-07-28 Dave Morrison <[EMAIL PROTECTED]>
+
+ * Engine.pm: revised "switch debs during long builds" code: if a
+ needed .deb exists but is not installed, we install it without
+ asking. (If it doesn't exist, we allow the process to continue --
+ it will quit with an error, and the user must then start over.)
+
2005-07-28 Daniel Macks <[EMAIL PROTECTED]>
* Engine.pm: cleanup_debs: don't delete .deb of pkgs that are
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO September
19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
