Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv12300
Modified Files:
FinkLib.pm buildfink
Log Message:
Reread package list before removing buildlocks
Index: FinkLib.pm
===================================================================
RCS file: /cvsroot/fink/scripts/buildfink/FinkLib.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- FinkLib.pm 9 Mar 2006 21:13:34 -0000 1.13
+++ FinkLib.pm 26 May 2006 21:09:30 -0000 1.14
@@ -62,13 +62,17 @@
}
}
+sub readPackages {
+ $Fink::Status::the_instance ||= Fink::Status->new();
+ $Fink::Status::the_instance->read();
+}
+
# Purge packages we may have previously built
sub purgeNonEssential {
my @essentials = map { quotemeta($_) }
Fink::Package->list_essential_packages();
my $re = "^(?:" . join("|", @essentials) . ")\$";
- $Fink::Status::the_instance ||= Fink::Status->new();
- $Fink::Status::the_instance->read();
+ readPackages();
my @packages = Fink::Package->list_packages();
my @purgelist;
Index: buildfink
===================================================================
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- buildfink 24 May 2006 20:51:53 -0000 1.26
+++ buildfink 26 May 2006 21:09:30 -0000 1.27
@@ -660,6 +660,7 @@
# at the same time. They can get left over if the system crashes
# while building a package.
sub removeBuildLocks {
+ FinkLib::readPackages();
foreach my $pkgname (Fink::Package->list_packages()) {
next unless $pkgname =~ /^fink-buildlock-.*/;
system("dpkg", "-r", $pkgname);
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
