Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv31648
Modified Files:
Tag: selfupdate_classes
ChangeLog SelfUpdate.pm
Log Message:
Clean up importing
Index: SelfUpdate.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/SelfUpdate.pm,v
retrieving revision 1.117.2.4
retrieving revision 1.117.2.5
diff -u -d -r1.117.2.4 -r1.117.2.5
--- SelfUpdate.pm 7 Mar 2007 09:41:17 -0000 1.117.2.4
+++ SelfUpdate.pm 8 Mar 2007 03:12:30 -0000 1.117.2.5
@@ -23,15 +23,12 @@
package Fink::SelfUpdate;
-use Fink::Services qw(&execute &version_cmp &aptget_lockwait);
+use Fink::Services qw(&execute);
use Fink::Bootstrap qw(&additional_packages);
use Fink::CLI qw(&print_breaking &prompt &prompt_boolean &prompt_selection);
-use Fink::Config qw($config $basepath $dbpath $distribution);
-use Fink::NetAccess qw(&fetch_url);
+use Fink::Config qw($config $basepath $distribution);
use Fink::Engine; # &aptget_update &cmd_install, but they aren't EXPORT_OK
use Fink::Package;
-use Fink::FinkVersion qw(&pkginfo_version);
-use Fink::Mirror;
use Fink::Command qw(cat chowname mkdir_p mv rm_f rm_rf touch);
use File::Find;
@@ -177,13 +174,11 @@
Fink::SelfUpdate::rsync->stamp_clear();
if (-d "$basepath/fink/dists/CVS") {
&do_direct_cvs();
- &do_finish();
- return;
} else {
&setup_direct_cvs();
- &do_finish();
- return;
}
+ &do_finish();
+ return;
}
elsif ($config->param("SelfUpdateMethod") eq 'rsync' and $method ne
'cvs'){
&need_devtools('rsync');
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1439.2.5
retrieving revision 1.1439.2.6
diff -u -d -r1.1439.2.5 -r1.1439.2.6
--- ChangeLog 7 Mar 2007 09:41:16 -0000 1.1439.2.5
+++ ChangeLog 8 Mar 2007 03:12:29 -0000 1.1439.2.6
@@ -1,5 +1,9 @@
2007-03-07 Daniel Macks <[EMAIL PROTECTED]>
+ * SelfUpdate.pm, SelfUpdate/*: clean up imports from other pkgs
+
+2007-03-07 Daniel Macks <[EMAIL PROTECTED]>
+
* SelfUpdate/Base.pm: add do_direct to public API
* SelfUpdate.pm, SelfUpdate/rsync.pm: migrate &SU::do_direct_rsync
to SU::rsync->do_direct
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
