Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3000
Modified Files:
ChangeLog Engine.pm PkgVersion.pm
Log Message:
buildlock packages are now Essential:yes to prevent accidental or
apt-get (recursive) removal.
Index: PkgVersion.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -d -r1.485 -r1.486
--- PkgVersion.pm 21 Oct 2005 02:19:28 -0000 1.485
+++ PkgVersion.pm 21 Oct 2005 19:20:09 -0000 1.486
@@ -4159,6 +4159,7 @@
Description: Package compile-time lockfile
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
Provides: fink-buildlock
+Essential: yes
EOF
# buildtime (anti)dependencies of pkg are runtime (anti)dependencies of
lockpkg
@@ -4226,8 +4227,7 @@
# Failure due to depenendecy problems leaves lockpkg in an
# "unpacked" state, so try to remove it entirely.
- &execute(dpkg_lockwait() . " -r $lockpkg", ignore_INT=>1) and
- &print_breaking('You can probably ignore that last
message from "dpkg -r"');
+ &execute(dpkg_lockwait() . " --force-remove-essential -r
$lockpkg 2>/dev/null", ignore_INT=>1);
}
# Even if installation fails, no reason to keep this around
@@ -4262,7 +4262,8 @@
if (exists $self->{_lockpkg}) {
print "Removing build-lock package...\n";
my $lockpkg = $self->{_lockpkg};
- if (&execute(dpkg_lockwait() . " -r $lockpkg", ignore_INT=>1)) {
+
+ if (&execute(dpkg_lockwait() . " --force-remove-essential -r
$lockpkg 2>/dev/null", ignore_INT=>1)) {
&print_breaking("WARNING: Can't remove package ".
"$lockpkg. ".
"This is not fatal, but
you may want to remove ".
Index: Engine.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Engine.pm,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -d -r1.334 -r1.335
--- Engine.pm 17 Oct 2005 16:12:23 -0000 1.334
+++ Engine.pm 21 Oct 2005 19:20:09 -0000 1.335
@@ -28,7 +28,7 @@
&execute &expand_percent
&count_files &get_arch
&call_queue_clear &call_queue_add
&lock_wait
- &aptget_lockwait &store_rename
&get_options
+ &dpkg_lockwait &aptget_lockwait
&store_rename &get_options
$VALIDATE_HELP);
use Fink::CLI qw(&print_breaking &print_breaking_stderr
&prompt_boolean &prompt_selection
@@ -1402,7 +1402,10 @@
if (@lock_pkgs) {
printf "Removing %i dead buildlock package(s)...\n", scalar
@lock_pkgs;
- Fink::PkgVersion::phase_deactivate(@lock_pkgs); # doesn't
return if failure
+ if (&execute(dpkg_lockwait() . " --force-remove-essential -r
@lock_pkgs 2>/dev/null", ignore_INT=>1)) {
+ print "Warning: could not remove all buildlock
packages!\n";
+ $locks_left = 1;
+ }
}
if (%lock_FHs) {
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1173
retrieving revision 1.1174
diff -u -d -r1.1173 -r1.1174
--- ChangeLog 21 Oct 2005 02:19:28 -0000 1.1173
+++ ChangeLog 21 Oct 2005 19:20:09 -0000 1.1174
@@ -1,3 +1,9 @@
+2005-10-21 Daniel Macks <[EMAIL PROTECTED]>
+
+ * Engine.pm, PkgVersion.pm: Make buildlock lock-packages
+ Essential:yes to prevent accidental or apt-get removal; use
+ --force-remove-essential to remove them.
+
2005-10-19 Daniel Macks <[EMAIL PROTECTED]>
* PkgVersion.pm: Switch get_description API to use named options.
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
