Update of /cvsroot/fink/scripts/10.4-update
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv641

Modified Files:
        ChangeLog update.pl 
Log Message:
print_breaking accepts multiple paragraphs.


Index: update.pl
===================================================================
RCS file: /cvsroot/fink/scripts/10.4-update/update.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- update.pl   14 Jun 2006 19:13:15 -0000      1.6
+++ update.pl   14 Jun 2006 20:13:25 -0000      1.7
@@ -58,27 +58,9 @@
 
        print "\n";
 
-       &Fink::CLI::print_breaking("This script is designed to update an 
existing fink installation from the 10.3 or 10.4-transitional distributions to 
the 10.4 distribution, on PowerPC hardware only.  This update process is not 
easy or seamless, and many users will prefer to erase their old installation 
and reinstall Fink anew, using the 0.8.1 installer.");
-
-       print "\n";
-
-       &Fink::CLI::print_breaking("You must be connected to the internet while 
running this script, as fink will be downloading package descriptions and 
source files periodically during the update.");
-
-       print "\n";
-
-       &Fink::CLI::print_breaking("This script will *not* run unattended: you 
will need to respond to various questions along the way.");
-
-       print "\n";
-
-       &Fink::CLI::print_breaking("If the script exits with an error (or if 
you interrupt it), IT IS VERY IMPORTANT that you repeatedly run the commands 
\"sudo apt-get dist-upgrade\" followed by \"fink update-all\" until no further 
errors are encountered.  If you fail to do this, you will be left with a 
partially updated fink installation which may lead to future, hard-to-debug, 
errors.");
-
-       print "\n";
-
-       &Fink::CLI::print_breaking("For advice about what to do about errors 
which this script may generate, consult the FAQ or ask in the \#fink IRC 
channel on irc.freenode.net .");
-
-       print "\n";
+       &Fink::CLI::print_breaking("This script is designed to update an 
existing fink installation from the 10.3 or 10.4-transitional distributions to 
the 10.4 distribution, on PowerPC hardware only.  This update process is not 
easy or seamless, and many users will prefer to erase their old installation 
and reinstall Fink anew, using the 0.8.1 installer.\n\nYou must be connected to 
the internet while running this script, as fink will be downloading package 
descriptions and source files periodically during the update.This script will 
*not* run unattended: you will need to respond to various questions along the 
way.\n\nIf the script exits with an error (or if you interrupt it), IT IS VERY 
IMPORTANT that you repeatedly run the commands \"sudo apt-get dist-upgrade\" 
followed by \"fink update-all\" until no further errors are encountered.  If 
you fail to do this, you will be left with a partially updated fink 
installation which may lead to future, hard-to-debug, errors.\n\nFor advice a
 bout what to do about errors which this script may generate, consult the FAQ 
or ask in the \#fink IRC channel on irc.freenode.net .\n\n");
 
-       die "OK, good luck.\n" unless &Fink::CLI::prompt_boolean("Are you sure 
you wish to continue?");
+       &Fink::CLI::prompt_boolean("Are you sure you wish to continue?") or die 
"OK, good luck.\n";
 
        print "\n";
 }

Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/scripts/10.4-update/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ChangeLog   14 Jun 2006 19:13:15 -0000      1.6
+++ ChangeLog   14 Jun 2006 20:13:25 -0000      1.7
@@ -1,3 +1,7 @@
+2006-06-14  Daniel Macks  <[EMAIL PROTECTED]>
+
+       * update.pl: print_breaking accepts multiple paragraphs.
+
 2006-06-14  Dave Morrison  <[EMAIL PROTECTED]>
 
        * update.pl: don't use 'fink cleanup', but make sure that stale deb



_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to