aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-10-27 16:41:16 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-10-27 16:41:16 +0000
commita30398817224d6e7bd6ce9e1a1cef471c1e36be5 (patch)
treef1f3586f5348a91b240ded93bfaec5bc581bc22e
parentf3e491267195c1650b41c127410c54e458c3872d (diff)
downloadrpmdrake-a30398817224d6e7bd6ce9e1a1cef471c1e36be5.tar
rpmdrake-a30398817224d6e7bd6ce9e1a1cef471c1e36be5.tar.gz
rpmdrake-a30398817224d6e7bd6ce9e1a1cef471c1e36be5.tar.bz2
rpmdrake-a30398817224d6e7bd6ce9e1a1cef471c1e36be5.tar.xz
rpmdrake-a30398817224d6e7bd6ce9e1a1cef471c1e36be5.zip
Get rid of standalone package
-rwxr-xr-xedit-urpm-sources.pl3
-rwxr-xr-xrpmdrake4
-rw-r--r--rpmdrake.pm4
3 files changed, 0 insertions, 11 deletions
diff --git a/edit-urpm-sources.pl b/edit-urpm-sources.pl
index 74351125..3f82c00a 100755
--- a/edit-urpm-sources.pl
+++ b/edit-urpm-sources.pl
@@ -275,7 +275,6 @@ really want to replace it?"), yesno => 1) or return 0;
);
} else {
if (member($i{name}, map { $_->{name} } @{$urpm->{media}})) {
- standalone::explanations("Removing medium $i{name}");
$urpm->select_media($i{name});
$urpm->remove_selected_media;
}
@@ -342,7 +341,6 @@ sub remove_callback {
my $wait = wait_msg(N("Please wait, removing medium..."));
my $name = $urpm->{media}[$row]{name};
- standalone::explanations("Removing medium $name");
$urpm->select_media($name);
$urpm->remove_selected_media;
$urpm->update_media(noclean => 1, nolock => 1);
@@ -422,7 +420,6 @@ sub edit_callback {
yesno => 1, text => { yes => N("Ok"), no => N("Cancel") }
) or return 0
);
- standalone::explanations("Removing medium $name");
my $saved_proxy = urpm::download::get_proxy($name);
undef $saved_proxy if !defined $saved_proxy->{http_proxy} && !defined $saved_proxy->{ftp_proxy};
$urpm->select_media($name);
diff --git a/rpmdrake b/rpmdrake
index 52047eef..9bcf38f8 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -373,7 +373,6 @@ sub extract_header {
my $hdlist = $medium->{virtual} ? "$medium->{url}/$medium->{with_hdlist}" : "$urpm->{statedir}/$medium->{hdlist}";
$hdlist =~ s/^file:\/+//;
if (-r $hdlist) {
- standalone::explanations("Extracting header of " . $p->header_filename . " from $hdlist");
my $packer;
eval { require packdrake; $packer = new packdrake($hdlist, quiet => 1) }
or log::l("Warning, hdlist seems corrupted :-("), goto header_non_available;
@@ -1505,8 +1504,6 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
return 0;
}
- standalone::explanations("Removing package $_") foreach sort @{$urpm->{ask_remove}};
-
my %pkgs = map { $_->id => undef } grep { $_->flag_selected } @{$urpm->{depslist}};
my ($local_sources, $list, $local_to_removes) = $urpm->get_source_packages(\%pkgs);
my $distant_number = scalar keys %pkgs;
@@ -1761,7 +1758,6 @@ sub get_installed_pkgs {
sub perform_removal {
my ($urpm, $pkgs) = @_;
my @toremove = map { if_($pkgs->{$_}{selected}, $pkgs->{$_}{urpm_name}) } keys %$pkgs;
- standalone::explanations("Removing package $_") foreach sort @toremove;
my @results;
slow_func_statusbar(
N("Please wait, removing packages..."),
diff --git a/rpmdrake.pm b/rpmdrake.pm
index 54a74897..c3d5c361 100644
--- a/rpmdrake.pm
+++ b/rpmdrake.pm
@@ -23,7 +23,6 @@
package rpmdrake;
use lib qw(/usr/lib/libDrakX);
-use standalone; #- warning, standalone must be loaded very first, for 'explanations'
use urpm::download ();
use urpm::prompt;
@@ -762,7 +761,6 @@ sub update_sources_interactive {
foreach (@{$urpm->{media}}) {
$_->{modified} and delete $_->{ignore};
}
- standalone::explanations("Updating media @media");
$urpm->select_media(@media);
update_sources_check(
$urpm,
@@ -783,10 +781,8 @@ sub add_medium_and_check {
local $urpm->{fatal} = sub { printf STDERR "Fatal: %s\n", $_[1]; $fatal_msg = to_utf8($_[1]); goto fatal_error };
local $urpm->{error} = sub { printf STDERR "Error: %s\n", $_[0]; push @error_msgs, to_utf8($_[0]) };
if ($options->{distrib}) {
- standalone::explanations("Adding distrib media @_");
@newnames = $urpm->add_distrib_media(@_);
} else {
- standalone::explanations("Adding medium @_");
$urpm->add_medium(@_);
}
if (@error_msgs) {