Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27772/perlmod/Fink
Modified Files:
ChangeLog Mirror.pm
Log Message:
don't fail on 13 master mirrors in a row
Index: Mirror.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Mirror.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Mirror.pm 8 Feb 2005 04:26:20 -0000 1.24
+++ Mirror.pm 28 Apr 2005 08:23:28 -0000 1.25
@@ -292,7 +292,16 @@
}
if ($next_set ne "") {
push @choice_list, "retry-next";
- if($#choice_list == 2) { # No more mirrors in this set,
default to next
+
+ # If two masters fail, and the masters come first, assume it's
a new
+ # file that hasn't yet reached the masters rather than going
through
+ # every single master.
+ my $finish_master = $self->{name} eq 'master'
+ && $config->param_default('MirrorOrder', '') eq
'MasterFirst'
+ && $self->{tries} >= 2;
+
+ # No more mirrors in this set or finished master, default to
next
+ if($#choice_list == 2 || $finish_master) {
$default = $#choice_list + 1;
}
}
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.985
retrieving revision 1.986
diff -u -d -r1.985 -r1.986
--- ChangeLog 28 Apr 2005 05:27:01 -0000 1.985
+++ ChangeLog 28 Apr 2005 08:23:28 -0000 1.986
@@ -1,5 +1,11 @@
2005-04-28 Dave Vasilevsky <[EMAIL PROTECTED]>
+ * Mirror.pm: When master is first, and fails twice, assume it's a file
+ that hasn't yet gotten sync'ed to the masters and just move to the next
+ set.
+
+2005-04-28 Dave Vasilevsky <[EMAIL PROTECTED]>
+
* Services.pm: Add no_block (non-blocking) ability to lock_wait.
* Package.pm: Use multi-dir finkinfodb system to avoid accidentally
deleting another Fink's DB.
-------------------------------------------------------
SF.Net email is sponsored by: Tell us your software development plans!
Take this survey and enter to win a one-year sub to SourceForge.net
Plus IDC's 2005 look-ahead and a copy of this survey
Click here to start! http://www.idcswdc.com/cgi-bin/survey?id=105hix
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
