summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--urpm/dudf.pm6
-rwxr-xr-xurpmi2
2 files changed, 3 insertions, 5 deletions
diff --git a/urpm/dudf.pm b/urpm/dudf.pm
index 8a8aec49..6b0470ad 100644
--- a/urpm/dudf.pm
+++ b/urpm/dudf.pm
@@ -229,7 +229,7 @@ sub store_userpkgs {
@{$self->{pkgs_user}} = @pkgs;
}
-# Store a list of packages selected bu urpmi to install
+# Store a list of packages selected by urpmi to install
sub store_toinstall {
my $self = shift;
shift;
@@ -244,7 +244,7 @@ sub upload_dudf {
my ($self, $options) = @_;
(my $cwd) = getcwd() =~ /(.*)/;
- print N("Compressing file... ");
+ print N("Compressing DUDF data... ");
# gzip the file to upload
open(FILE, $self->{dudf_file}) or do { print N("NOT OK\n"); return };
my $gz = gzopen($self->{dudf_file} . ".gz", "wb") or do { print N("NOT OK\n"); return };
@@ -257,7 +257,7 @@ sub upload_dudf {
close(FILE);
print N("OK\n");
- print N("Uploading file:\n");
+ print N("Uploading DUDF data:\n");
my (@ftp_files, @other_files);
push @other_files, $self->{dudf_filename};
my @l = (@ftp_files, @other_files);
diff --git a/urpmi b/urpmi
index fdf1227a..ee10eb96 100755
--- a/urpmi
+++ b/urpmi
@@ -529,8 +529,6 @@ if (@ask_unselect) {
}
}
- my $msg = N("The installation cannot continue because the following package has to be removed for others to be upgraded:\n%s\n");
-
if (my @conflicting_pkgs_msgs =
$urpm->{options}{'allow-force'} ? () : urpm::select::removed_packages_msgs($urpm, $state)) {
{