Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2791

Modified Files:
      Tag: apt_sources
        SelfUpdate.pm 
Log Message:
manipulate stamp-* files in new location


Index: SelfUpdate.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/SelfUpdate.pm,v
retrieving revision 1.67
retrieving revision 1.67.4.1
diff -u -d -r1.67 -r1.67.4.1
--- SelfUpdate.pm       27 Feb 2004 09:03:08 -0000      1.67
+++ SelfUpdate.pm       12 Jul 2004 15:07:05 -0000      1.67.4.1
@@ -96,6 +96,9 @@
 
        # By now the config param SelfUpdateMethod should be set.
        if (($config->param("SelfUpdateMethod") eq "cvs") and $useopt != 2){
+               if (-f "$finkdir/dists/stamp-rsync-live") {
+                       unlink "$finkdir/dists/stamp-rsync-live";
+               }
                if (-f "$finkdir/stamp-rsync-live") {
                        unlink "$finkdir/stamp-rsync-live";
                }
@@ -160,7 +163,7 @@
                }
                $latest_fink = cat "$srcdir/$currentfink";
                chomp($latest_fink);
-               if ( ! -f "$finkdir/stamp-cvs-live" and ! -f 
"$finkdir/stamp-rsync-live" )
+               if ( ! -f "$finkdir/stamp-cvs-live" and ! -f 
"$finkdir/stamp-rsync-live" and ! "$finkdir/dists/stamp-cvs-live" and ! -f 
"$finkdir/dists/stamp-rsync-live")
                {
                        # check if we need to upgrade
                        if (&version_cmp($latest_fink . '-1', '<=', $installed_version 
. '-1')) {
@@ -171,7 +174,7 @@
                                return;
                        }
                } else {
-                       rm_f "$finkdir/stamp-rsync-live", "$finkdir/stamp-cvs-live";
+                       rm_f "$finkdir/stamp-rsync-live", "$finkdir/stamp-cvs-live", 
"$finkdir/dists/stamp-rsync-live", "$finkdir/dists/stamp-cvs-live";
                        &execute("/usr/bin/find $finkdir -name CVS -type d -print0 | 
xargs -0 /bin/rm -rf");
                }
                &do_tarball($latest_fink);
@@ -638,8 +641,8 @@
 
        rm_rf "$basepath/fink/$dist/CVS";
        rm_rf "$basepath/fink/CVS";
-       touch "stamp-rsync-live";
-       rm_f "stamp-cvs-live";
+       touch "$dist/stamp-rsync-live";
+       rm_f "stamp-cvs-live", "$dist/stamp-cvs-live";
        # cleanup after ourselves and continue with the update.
        unlink("$descdir/TIMESTAMP");
        rename("$descdir/TIMESTAMP.tmp", "$descdir/TIMESTAMP");



-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to