summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-06-28 16:40:51 +0000
committerFrancois Pons <fpons@mandriva.com>2001-06-28 16:40:51 +0000
commite9547c5cb6e8517326b797508448458d49e5d7cf (patch)
tree4bb8aa8b2862c0c8199cb1493907e68c4b8f4aa0
parent5b885b9a57ce15f8b8779e7019b28f8c6ad6eb13 (diff)
downloadurpmi-e9547c5cb6e8517326b797508448458d49e5d7cf.tar
urpmi-e9547c5cb6e8517326b797508448458d49e5d7cf.tar.gz
urpmi-e9547c5cb6e8517326b797508448458d49e5d7cf.tar.bz2
urpmi-e9547c5cb6e8517326b797508448458d49e5d7cf.tar.xz
urpmi-e9547c5cb6e8517326b797508448458d49e5d7cf.zip
dependencies is right.
-rw-r--r--urpm.pm12
-rwxr-xr-xurpmi4
-rwxr-xr-xurpmq10
3 files changed, 13 insertions, 13 deletions
diff --git a/urpm.pm b/urpm.pm
index 25c3812d..979a8997 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -651,7 +651,7 @@ sub update_media {
$medium->{ignore} and next;
$urpm->{log}(_("reading hdlist file [%s]", "$urpm->{statedir}/$medium->{hdlist}"));
$urpm->{params}->read_hdlists("$urpm->{statedir}/$medium->{hdlist}") or next;
- $urpm->{log}(_("computing dependancy"));
+ $urpm->{log}(_("computing dependencies"));
$urpm->{params}->compute_depslist();
}
@@ -1042,7 +1042,7 @@ sub compute_closure {
my ($id, @packages) = (undef, keys %$packages);
#- at this level, compute global closure of what is requested, regardless of
- #- choices for which all package in the choices are taken and their dependancies.
+ #- choices for which all package in the choices are taken and their dependencies.
#- allow iteration over a modifying list.
while (defined($id = shift @packages)) {
#- get a relocated id if possible, by this way.
@@ -1112,7 +1112,7 @@ sub filter_packages_to_upgrade {
#- there are not too many packages selected here to allow
#- take care of package up-to-date at this point,
#- so check version and if the package does not need to
- #- updated, ignore it and his dependancies.
+ #- updated, ignore it and his dependencies.
rpmtools::db_traverse_tag($db, "name", [ map { $urpm->{params}{depslist}[$_]{name} } keys %$packages ],
[ qw(name version release serial) ], sub {
my ($p) = @_;
@@ -1132,7 +1132,7 @@ sub filter_packages_to_upgrade {
#- select first level of packages, as in packages list will only be
#- examined deps of each.
#- at this level, compute global closure of what is requested, regardless of
- #- choices for which all package in the choices are taken and their dependancies.
+ #- choices for which all package in the choices are taken and their dependencies.
#- allow iteration over a modifying list.
@closures{keys %$packages} = ();
$urpm->compute_closure(\%closures, undef, sub { my ($urpm, @l) = @_; @l });
@@ -1161,7 +1161,7 @@ sub filter_packages_to_upgrade {
rpmtools::db_close($db);
#- recompute closure but ask for which package to select on a choices.
- #- this is necessary to have the result before the end else some dependancy may
+ #- this is necessary to have the result before the end else some dependency may
#- be losed or added.
#- accept no choice allow to browse list, and to compute it with more iteration.
%closures = (); @closures{keys %$packages} = ();
@@ -1274,7 +1274,7 @@ sub filter_minimal_packages_to_upgrade {
my ($id, %installed);
#- at this level, compute global closure of what is requested, regardless of
- #- choices for which all package in the choices are taken and their dependancies.
+ #- choices for which all package in the choices are taken and their dependencies.
#- allow iteration over a modifying list.
while (defined($id = shift @packages)) {
if (ref $id) {
diff --git a/urpmi b/urpmi
index dd1e2fce..3e01be08 100755
--- a/urpmi
+++ b/urpmi
@@ -147,7 +147,7 @@ if (@files) {
m|^/| or $_ = "./$_" foreach @files;
#- read provides file which is needed only to compute incremental
- #- dependancies, of files provided.
+ #- dependencies, of files provided.
$use_provides or $urpm->read_provides;
#- build closure with local package and return list of names.
@@ -165,7 +165,7 @@ $urpm->relocate_depslist(use_active => $update);
#- search the packages according the selection given by the user,
#- basesystem is added to the list so if it need to be upgraded,
-#- all its dependancy will be updated too.
+#- all its dependency will be updated too.
#- make sure basesystem exists before.
my %packages;
$urpm->search_packages(\%packages,
diff --git a/urpmq b/urpmq
index 3262d1f8..878402b3 100755
--- a/urpmq
+++ b/urpmq
@@ -38,12 +38,12 @@ This is free software and may be redistributed under the terms of the GNU GPL.
usage:
-h - print this help message.
-v - verbose mode.
- -d - extend query to package dependancies.
+ -d - extend query to package dependencies.
-u - remove package if a better version is already installed.
- -m - extend query to package dependancies, remove already
+ -m - extend query to package dependencies, remove already
installed package that provide what is necessary, add
packages that may be block the upgrade.
- -M - extend query to package dependancies and remove already
+ -M - extend query to package dependencies and remove already
installed package only if they are newer or the same.
-c - choose complete method for resolving requires closure.
-p - allow search in provides to find package.
@@ -101,7 +101,7 @@ $query->{use_provides} and $urpm->read_provides;
if (@files) {
#- read provides file which is needed only to compute incremental
- #- dependancies, of files provided.
+ #- dependencies, of files provided.
$query->{use_provides} or $urpm->read_provides;
#- build closure with local package and return list of names.
@@ -116,7 +116,7 @@ if ($query->{update}) {
$urpm->relocate_depslist(use_active => $query->{update});
#- search the packages according the selection given by the user,
-#- basesystem is added to the list so if it need to be upgraded, all its dependancy
+#- basesystem is added to the list so if it need to be upgraded, all its dependency
#- will be updated too.
my %packages;
$urpm->search_packages(\%packages, [ @names ], use_provides => $query->{use_provides}, use_active => $query->{update})