Update of /cvsroot/fink/experimental/thesin/finkmods
In directory sc8-pr-cvs1:/tmp/cvs-serv24050
Modified Files:
fink-verbcvs.patch
Log Message:
added stronger regexs, forgot some fixed to add locally changed files to warning list
and hopefully fixed Martins comment about the self repair function and not dumping the
vars on rerun.
Index: fink-verbcvs.patch
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkmods/fink-verbcvs.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fink-verbcvs.patch 2 Jan 2003 16:52:00 -0000 1.8
+++ fink-verbcvs.patch 2 Jan 2003 17:28:44 -0000 1.9
@@ -1,6 +1,6 @@
diff -ruN fink/perlmod/Fink/SelfUpdate.pm fink-verbcvs/perlmod/Fink/SelfUpdate.pm
--- fink/perlmod/Fink/SelfUpdate.pm 2002-12-08 22:29:56.000000000 -0700
-+++ fink-verbcvs/perlmod/Fink/SelfUpdate.pm 2003-01-02 09:40:43.000000000 -0700
++++ fink-verbcvs/perlmod/Fink/SelfUpdate.pm 2003-01-02 10:17:09.000000000 -0700
@@ -23,7 +23,7 @@
package Fink::SelfUpdate;
@@ -40,7 +40,7 @@
+ if (Fink::Config::verbosity_level() > 0) {
+ &print_breaking($msg);
+ }
-+ if ($msg =~ m/conflict/i or $msg =~ m/not in remote repository/i) {
++ if ($msg =~ /^\s(W|E)\s.*$/) {
+ push(@lines, $line);
+ }
+ if ($msg =~ m/updated/i and not $msg =~ m/locally/i) {
@@ -66,7 +66,7 @@
### update from packages tarball
diff -ruN fink/perlmod/Fink/Services.pm fink-verbcvs/perlmod/Fink/Services.pm
--- fink/perlmod/Fink/Services.pm 2002-12-20 10:00:32.000000000 -0700
-+++ fink-verbcvs/perlmod/Fink/Services.pm 2003-01-02 09:49:36.000000000 -0700
++++ fink-verbcvs/perlmod/Fink/Services.pm 2003-01-02 10:24:43.000000000 -0700
@@ -43,7 +43,7 @@
&prompt &prompt_boolean &prompt_selection
&version_cmp &latest_version
@@ -89,7 +89,7 @@
+
+ chomp($line);
+
-+ if ($line =~
/^(M|P|U|R|C|\?|A).*\/(unstable|stable)\/.*\/(.*)-(.*-.*)\.(info|patch|.*)?$/) {
++ if ($line =~
+/^(M|P|U|R|C|\?|A)\s.*\/(unstable|stable)\/.*\/(.*)-(.*-.*)\.(info|patch|.*)?$/) {
+ if ($1 eq "P") {
+ $cvsaction = "updated";
+ } elsif ($1 eq "U") {
@@ -158,7 +158,7 @@
+ $numdump = 0;
+
+ foreach $line (@lines) {
-+ if ($line =~ /^(C|\?) (.*)$/) {
++ if ($line =~ /^(C|\?|M|R|A)\s(.*)$/) {
+ if ($1 eq "C") {
+ push(@errors, $2);
+ $numerrors++;
@@ -192,33 +192,8 @@
+ }
+ }
+
-+ if ($numerrors > 0) {
-+ $answer =
-+ &prompt_boolean("Would you like to correct the $numerrors error(s)?", 0);
-+ if ($answer == 1) {
-+ print "Self repairing CVS update...\n";
-+ if (not -d "$basepath/var/fink/quarantine") {
-+ &execute("mkdir -p $basepath/var/fink/quarantine");
-+ }
-+ foreach $line (@errors) {
-+ if ($line =~ /^.*\/(unstable|stable)\/.*\/(.*)-(.*-.*)\..*$/) {
-+ print " Relocating $1 version of $2 ($3)...";
-+ &execute("mv $basepath/fink/$line $basepath/var/fink/quarantine");
-+ print "OK\n";
-+ } elsif ($line =~ /^(.*)$/) {
-+ print " Relocating $1 mirror list...";
-+ &execute("mv $basepath/lib/fink/mirror/$line
$basepath/var/fink/quarantine");
-+ print "OK\n";
-+ }
-+ }
-+ print "\nSelf repair complete! Now restarting selfudpate.\n";
-+ require Fink::SelfUpdate;
-+ Fink::SelfUpdate::check(1);
-+ }
-+ }
-+
-+ if ($numdump < 30 && ($numwarns > 0 || $numerrors > 0) &&
-+ Fink::Config::verbosity_level() > 0) {
++ if (($numdump > 0 && ($numwarns > 0 || $numerrors > 0) &&
++ Fink::Config::verbosity_level() > 0) || $numdump < 30) {
+ my $msg = "Warnings are not fatal and will likely not affect ".
+ "fink. Said warnings, in most cases, can be safely ignored. ".
+ "Errors on the other hand should be viewed but ".
@@ -246,6 +221,31 @@
+ print IN "$line\n";
+ }
+ close(IN);
++ }
++ }
++
++ if ($numerrors > 0) {
++ $answer =
++ &prompt_boolean("Would you like to correct the $numerrors error(s)?", 0);
++ if ($answer == 1) {
++ print "Self repairing CVS update...\n";
++ if (not -d "$basepath/var/fink/quarantine") {
++ &execute("mkdir -p $basepath/var/fink/quarantine");
++ }
++ foreach $line (@errors) {
++ if ($line =~ /^.*\/(unstable|stable)\/.*\/(.*)-(.*-.*)\..*$/) {
++ print " Relocating $1 version of $2 ($3)...";
++ &execute("mv $basepath/fink/$line $basepath/var/fink/quarantine");
++ print "OK\n";
++ } elsif ($line =~ /^(.*)$/) {
++ print " Relocating $1 mirror list...";
++ &execute("mv $basepath/lib/fink/mirror/$line
+$basepath/var/fink/quarantine");
++ print "OK\n";
++ }
++ }
++ print "\nSelf repair complete! Now restarting selfudpate.\n";
++ require Fink::SelfUpdate;
++ Fink::SelfUpdate::check(1);
+ }
+ }
+}
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
