Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv20286/perlmod/Fink
Modified Files:
ChangeLog Engine.pm
Log Message:
fix the out-of-date warning
Index: Engine.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Engine.pm,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -d -r1.397 -r1.398
--- Engine.pm 23 Jan 2007 18:57:03 -0000 1.397
+++ Engine.pm 15 Feb 2007 23:04:26 -0000 1.398
@@ -47,6 +47,7 @@
use Fink::Validation;
use Fink::Checksum;
use Fink::Scanpackages;
+use IO::Handle;
use strict;
use warnings;
@@ -1587,7 +1588,27 @@
# don't bother doing this on point release, of course it's out-of-date
;)
if ($config->param("SelfUpdateMethod") ne "point")
{
- my $cache_file = Fink::Scanpackages->default_cache;
+ my $cache_file = Fink::Package->db_index;
+
+ my $dir = IO::Handle->new();
+ if (opendir($dir, "$basepath/fink/dists"))
+ {
+ for my $entry (readdir($dir))
+ {
+ if ($entry =~ /^stamp-/)
+ {
+ $cache_file = $basepath .
'/fink/dists/' . $entry;
+ last;
+ }
+ }
+ closedir($dir);
+ }
+ else
+ {
+ warn "unable to open $basepath/fink/dists: $!";
+ }
+
+
if (not -f $cache_file or (-M $cache_file > 14)) {
my $oldindexes =
lc(Fink::Config::get_option("OldIndexes", "warn"));
if ($oldindexes !~ /^(ignore|update|warn)$/) {
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1432
retrieving revision 1.1433
diff -u -d -r1.1432 -r1.1433
--- ChangeLog 15 Feb 2007 19:38:26 -0000 1.1432
+++ ChangeLog 15 Feb 2007 23:04:25 -0000 1.1433
@@ -2,6 +2,9 @@
* NetAccess.pm: set a timeout on curl, since it can block
indefinitely while connecting, in some cases
+ * Engine.pm, SelfUpdate.pm: Fink::Scanpackages is wrong, use
+ the cvs/rsync stat files if available, or fallback to
+ Fink::Package->db_index otherwise
2007-02-14 Benjamin Reed <[EMAIL PROTECTED]>
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
