Update of /cvsroot/fink/fink/perlmod/Fink
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv348

Modified Files:
        ChangeLog Configure.pm 
Log Message:
don't ask about the unstable tree if a SelfUpdateMethod has not been chosen yet
(necessary change for successful bootstrapping)


Index: Configure.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Configure.pm,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- Configure.pm        7 Mar 2009 16:25:03 -0000       1.58
+++ Configure.pm        16 May 2009 00:43:48 -0000      1.59
@@ -187,7 +187,7 @@
 
        print "\n";
 
-       {
+if ($config->has_param("SelfUpdateMethod"))    {
                print_breaking(
                        "The \"unstable\" tree contains many packages not 
present in the \"stable\" ".
                        "tree and often has newer versions of those that are 
present. All package ".
@@ -235,6 +235,11 @@
                                }
                        }
                }
+       } else {
+print_breaking("The selfupdate method has not been set yet, so you ".
+"are not yet being asked whether to include the \"unstable\" fink tree. ".
+"If you are interested in the \"unstable\" tree, first run \"fink ".
+                          "selfupdate\" and then run \"fink configure\" 
again.");
        }
 
        $verbose = $config->param_default("Verbose", 1);

Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1620
retrieving revision 1.1621
diff -u -d -r1.1620 -r1.1621
--- ChangeLog   15 May 2009 22:21:52 -0000      1.1620
+++ ChangeLog   16 May 2009 00:43:48 -0000      1.1621
@@ -5,6 +5,8 @@
        path to the apt-get executable
        * FinkVersion.pm.in: take the current architecture into account when 
        reporting the default binary distribution
+       * Configure.pm: don't ask about the unstable tree if a SelfUpdateMethod
+       has not been chosen yet (necessary change for successful bootstrapping)
 
 2009-05-13  Dave Vasilevsky  <v...@users.sourceforge.net>
 


------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables 
unlimited royalty-free distribution of the report engine 
for externally facing server and web deployment. 
http://p.sf.net/sfu/businessobjects
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to