Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1:/tmp/cvs-serv20795

Modified Files:
      Tag: branch_0_11_1
        ChangeLog SelfUpdate.pm 
Log Message:
fixing update procedure for the 10.2 revision


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.208
retrieving revision 1.208.2.1
diff -u -r1.208 -r1.208.2.1
--- ChangeLog   15 Oct 2002 22:34:13 -0000      1.208
+++ ChangeLog   4 Dec 2002 13:58:42 -0000       1.208.2.1
@@ -1,3 +1,10 @@
+2002-12-04  Dave Morrison <[EMAIL PROTECTED]>
+
+       * SelfUpdate.pm: Modify the test used during the non-CVS version of 
+       fink selfupdate to check CURRENT_VERSION and download the file named 
+       dists-###.tar.gz (rather than LATEST_VERSION and 
+       packages-###.tar.gz)
+
 2002-10-15  Max Horn  <[EMAIL PROTECTED]>
 
        * Engine.pm: Fixed a wrong 'circular dependencies' error caused by my 

Index: SelfUpdate.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/SelfUpdate.pm,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -r1.23 -r1.23.2.1
--- SelfUpdate.pm       9 Sep 2002 00:11:38 -0000       1.23
+++ SelfUpdate.pm       4 Dec 2002 13:58:42 -0000       1.23.2.1
@@ -129,12 +129,19 @@
   $config->save();
 
   # get the file with the current release number
-  if (&fetch_url("http://fink.sourceforge.net/LATEST-FINK";, $srcdir)) {
+  my $currentfink;
+  $currentfink = "CURRENT-FINK";
+  ### if we are in 10.1, need to use "LATEST-FINK" not "CURRENT-FINK"
+  if ($Fink::Config::distribution =~ /10.1/) {
+      $currentfink = "LATEST-FINK";
+  }
+
+  if (&fetch_url("http://fink.sourceforge.net/$currentfink";, $srcdir)) {
     die "Can't get latest version info\n";
   }
 
   # check if we need to upgrade
-  $latest_fink = `cat $srcdir/LATEST-FINK`;
+  $latest_fink = `cat $srcdir/$currentfink`;
   chomp($latest_fink);
   if (&version_cmp($latest_fink, $installed_version) <= 0) {
     print "\n";
@@ -371,7 +378,13 @@
 
   # go ahead and upgrade
   # first, download the packages tarball
-  $dir = "packages-$newversion";
+  $dir = "dists-$newversion";
+
+  ### if we are in 10.1, need to use "packages" not "dists"
+  if ($Fink::Config::distribution =~ /10.1/) {
+      $dir = "packages-$newversion";
+  }
+  
   $pkgtarball = "$dir.tar.gz";
   $url = "mirror:sourceforge:fink/$pkgtarball";
 



-------------------------------------------------------
This SF.net email is sponsored by: Microsoft Visual Studio.NET 
comprehensive development tool, built to increase your 
productivity. Try a free online hosted session at:
http://ads.sourceforge.net/cgi-bin/redirect.pl?micr0003en
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to