summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--urpm.pm3
-rwxr-xr-xurpmi5
2 files changed, 0 insertions, 8 deletions
diff --git a/urpm.pm b/urpm.pm
index 6c7327ed..8986a94f 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -821,7 +821,6 @@ sub add_distrib_media {
#- at this point, we have found a media.cfg file, so parse it
#- and create all necessary media according to it.
my $medium = $options{initial_number} || 1;
- my @media_list_toadd;
foreach my $media ($distribconf->listmedia) {
my $skip = 0;
@@ -1413,7 +1412,6 @@ this could happen if you mounted manually the directory when creating the medium
} else {
#- check for a reconfig.urpmi file (if not already reconfigured)
if (!$media_redone{$medium->{name}} && !$medium->{noreconfigure}) {
- my $reconfig_urpmi_url = "$medium->{url}/reconfig.urpmi";
unlink(my $reconfig_urpmi = "$urpm->{cachedir}/partial/reconfig.urpmi");
eval {
$urpm->{sync}(
@@ -2873,7 +2871,6 @@ sub prepare_transaction {
my ($urpm, $set, $list, $sources, $transaction_list, $transaction_sources) = @_;
foreach my $id (@{$set->{upgrade}}) {
- my $pkg = $urpm->{depslist}[$id];
foreach (0..$#$list) {
exists $list->[$_]{$id} and $transaction_list->[$_]{$id} = $list->[$_]{$id};
}
diff --git a/urpmi b/urpmi
index 2ffc7152..be26e4c2 100755
--- a/urpmi
+++ b/urpmi
@@ -280,7 +280,6 @@ if ($logfile && !$INC{"Devel/Trace.pm"}) {
#- fork twice to copy stdout and stderr to $logfile
unless ($pid_out = open STDOUT, "|-") {
- my $buf_r;
local $_;
while (<STDIN>) {
open my $fh, ">>$logfile"; select $fh; $| = 1;
@@ -293,7 +292,6 @@ if ($logfile && !$INC{"Devel/Trace.pm"}) {
exit 0;
}
unless ($pid_err = open STDERR, "|-") {
- my $buf_r;
local $_;
while (<STDIN>) {
open my $fh, ">>$logfile"; select $fh; $| = 1;
@@ -540,7 +538,6 @@ have to be removed for others to be upgraded:\n%s\n", $list), "\n";
if ($urpm->{options}{auto}) {
print "$msg\n";
} else {
- my $noexpr = N("Nn");
my $yesexpr = N("Yy");
message_input($msg . N(" (y/N) "), $force && $yesexpr, boolean => 1) =~ /[$yesexpr]/ or exit 0;
}
@@ -673,7 +670,6 @@ foreach my $set (@{$state->{transaction} || []}) {
print "$msg:\n$p\n\n";
exit 1;
} else {
- my $noexpr = N("Nn");
my $yesexpr = N("Yy");
message_input("$msg:\n$p\n$msg2" . N(" (y/N) "), $force && $yesexpr, boolean => 1) =~ /[$yesexpr]/ or exit 1;
}
@@ -759,7 +755,6 @@ foreach my $set (@{$state->{transaction} || []}) {
++$urpm->{logger_id};
push @errors, @l;
} else {
- my $noexpr = N("Nn");
my $yesexpr = N("Yy");
message_input(N("Try installation without checking dependencies? (y/N) "),
$force && $yesexpr, boolean => 1) =~ /[$yesexpr]/ or ++$nok, next;