Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30667
Modified Files:
ChangeLog Configure.pm
Log Message:
fix spotlight warning
Index: Configure.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Configure.pm,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- Configure.pm 25 May 2005 02:50:31 -0000 1.42
+++ Configure.pm 26 May 2005 21:26:45 -0000 1.43
@@ -231,34 +231,36 @@
=item spotlight_warning
Warn the user if they are choosing a build path which will be indexed by
-Spotlight. Returns true if the user heeded the warning. This warning
-will only be seen once.
+Spotlight. Returns true if changes have been made to the Fink configuration,
+which will need to be saved.
=cut
sub spotlight_warning {
my $builddir = $config->param_default("Buildpath",
-
"$basepath/src/fink.build");
- my $result = 0;
-
+
"$basepath/src/fink.build");
if ( $> == 0
&& !$config->has_flag('SpotlightWarning')
&& $builddir !~ /\.build$/
&& $config->param("distribution") ge "10.4") {
+
$config->set_flag('SpotlightWarning');
+
print "\n";
- $result =
+ my $response =
prompt_boolean("Your current build directory
'$builddir' will be ".
"indexed by Spotlight, which can make packages
build quite ".
"slowly.\n\n".
- "Would you like to add '.build' to the end of
your build ".
+ "Would you like to use '$builddir.build' as
your new build ".
"directory, so that Spotlight will not index
it?",
default => 1);
-
- $config->set_param("Buildpath", $builddir . ".build") if
$result;
print "\n";
+
+ $config->set_param("Buildpath", $builddir . ".build") if
$response;
+ return 1;
}
- return $result;
+
+ return 0;
}
=item choose_mirrors
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1024
retrieving revision 1.1025
diff -u -d -r1.1024 -r1.1025
--- ChangeLog 26 May 2005 18:23:53 -0000 1.1024
+++ ChangeLog 26 May 2005 21:26:43 -0000 1.1025
@@ -1,6 +1,10 @@
+2005-05-26 Dave Vasilevsky <[EMAIL PROTECTED]>
+
+ * Configure.pm: Fix Spotlight warning.
+
2005-05-26 Daniel Macks <[EMAIL PROTECTED]>
- * PkgVernios.pm: Better err if qpkg-query fails while removing buildlock
+ * PkgVersion.pm: Better err if qpkg-query fails while removing buildlock
2005-05-26 Daniel Macks <[EMAIL PROTECTED]>
-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
