Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26046
Modified Files:
ChangeLog Package.pm Engine.pm
Log Message:
dont load db for cleanup unless needed
Index: Engine.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Engine.pm,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -d -r1.320 -r1.321
--- Engine.pm 5 Sep 2005 10:47:57 -0000 1.320
+++ Engine.pm 8 Sep 2005 02:33:00 -0000 1.321
@@ -114,7 +114,7 @@
'selfupdate-finish' => [\&cmd_selfupdate_finish, 1, 1, 1],
'validate' => [\&cmd_validate, 0, 0, 0],
'check' => [\&cmd_validate, 0, 0, 0],
- 'cleanup' => [\&cmd_cleanup, 1, 1, 1],
+ 'cleanup' => [\&cmd_cleanup, 0, 1, 1],
'splitoffs' => [\&cmd_splitoffs, 1, 0, 0],
'splits' => [\&cmd_splitoffs, 1, 0, 0],
'showparent' => [\&cmd_showparent, 1, 0, 0],
@@ -1067,10 +1067,10 @@
%opts{debs,sources,buildlocks}
Options:
-%opts{keep-src,dry-run,buildlocks,help}
+%opts{keep-src,dry-run,help}
FORMAT
-
+
$modes{srcs} && &cleanup_sources(%opts);
$modes{debs} && &cleanup_debs(%opts);
$modes{bl} && &cleanup_buildlocks(%opts);
@@ -1110,7 +1110,8 @@
sub cleanup_sources {
my %opts = (dryrun => 0, keep_old => 0, @_);
-
+ Fink::Package->require_packages();
+
my $srcdir = "$basepath/src";
my $oldsrcdir = "$srcdir/old";
@@ -1205,6 +1206,7 @@
sub cleanup_debs {
my %opts = (dryrun => 0, @_);
+ Fink::Package->require_packages();
my $file_count;
Index: Package.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Package.pm,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- Package.pm 31 Aug 2005 10:55:48 -0000 1.160
+++ Package.pm 8 Sep 2005 02:33:00 -0000 1.161
@@ -43,8 +43,6 @@
our $VERSION = 1.00;
our @ISA = qw(Fink::Base);
-our $have_shlibs; # Have we loaded the shlibs?
-
our $packages = undef; # The loaded packages (undef if unloaded)
our $valid_since = undef; # The earliest time with the same DB as now
@@ -447,9 +445,6 @@
sub require_packages {
my $class = shift;
-# 0 => both
-# 1 => shlibs
-# 2 => package
$class->load_packages unless defined $packages;
}
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1130
retrieving revision 1.1131
diff -u -d -r1.1130 -r1.1131
--- ChangeLog 7 Sep 2005 06:09:40 -0000 1.1130
+++ ChangeLog 8 Sep 2005 02:33:00 -0000 1.1131
@@ -1,3 +1,9 @@
+2005-09-07 Dave Vasilevsky <[EMAIL PROTECTED]>
+
+ * Package.pm: Remove stray references to Shlibs
+ * Engine.pm: Remove duplicate --buildlocks help item for cleanup. Don't
+ load package DB for cleanup unless needed.
+
2005-09-07 Daniel Macks <[EMAIL PROTECTED]>
* PkgVersion.pm: get_description needs to make a copy of the whole
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
