summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2009-09-20 12:09:10 -0500
committerDan McGee <dan@archlinux.org>2009-09-20 12:09:10 -0500
commit6bfca2fd14d07a18d7000d1f9dd998428036656f (patch)
treec766b1ea0071f17857a975b15f53a8f77909f46d /src
parentef3716877032941f7882c11c5a091abef95ef983 (diff)
parent338c6546ff86acbb25c1508439adfb89c3dea952 (diff)
downloadpacman-6bfca2fd14d07a18d7000d1f9dd998428036656f.tar.xz
Merge branch 'maint'
Message updates made this one a bit messy, but nothing too bad. Conflicts: lib/libalpm/add.c lib/libalpm/remove.c
Diffstat (limited to 'src')
-rw-r--r--src/pacman/package.c2
-rw-r--r--src/pacman/pacman.c10
-rw-r--r--src/pacman/query.c4
-rw-r--r--src/pacman/sync.c2
4 files changed, 9 insertions, 9 deletions
diff --git a/src/pacman/package.c b/src/pacman/package.c
index 328d5bf6..3b145164 100644
--- a/src/pacman/package.c
+++ b/src/pacman/package.c
@@ -84,7 +84,7 @@ void dump_pkg_full(pmpkg_t *pkg, int level)
}
if(level>0) {
- /* compute this here so we don't get a puase in the middle of output */
+ /* compute this here so we don't get a pause in the middle of output */
requiredby = alpm_pkg_compute_requiredby(pkg);
}
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 64598b09..2a228ed9 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -130,7 +130,7 @@ static void usage(int op, const char * const myname)
printf(_(" -l, --list <repo> view a list of packages in a repo\n"));
printf(_(" -p, --print-uris print out URIs for given packages and their dependencies\n"));
printf(_(" -s, --search <regex> search remote repositories for matching strings\n"));
- printf(_(" -u, --sysupgrade upgrade all outdated packages (-uu enables downgrade)\n"));
+ printf(_(" -u, --sysupgrade upgrade installed packages (-uu allows downgrade)\n"));
printf(_(" -w, --downloadonly download packages but do not install/upgrade anything\n"));
printf(_(" -y, --refresh download fresh package databases from the server\n"));
printf(_(" --needed don't reinstall up to date packages\n"));
@@ -395,7 +395,7 @@ static int parseargs(int argc, char *argv[])
{0, 0, 0, 0}
};
- while((opt = getopt_long(argc, argv, "RUFQSTr:b:vkhscVfmnoldepqituwygz", opts, &option_index))) {
+ while((opt = getopt_long(argc, argv, "RUQSTr:b:vkhscVfmnoldepqituwygz", opts, &option_index))) {
alpm_list_t *list = NULL, *item = NULL; /* lists for splitting strings */
if(opt < 0) {
@@ -454,7 +454,7 @@ static int parseargs(int argc, char *argv[])
config->flags |= PM_TRANS_FLAG_ALLDEPS;
break;
case 1009:
- config->logfile = strdup(optarg);
+ config->logfile = strndup(optarg, PATH_MAX);
break;
case 1010:
list = strsplit(optarg, ',');
@@ -665,7 +665,7 @@ int download_with_xfercommand(const char *url, const char *localpath,
/* cwd to the download directory */
getcwd(cwd, PATH_MAX);
if(chdir(localpath)) {
- pm_printf(PM_LOG_WARNING, "could not chdir to %s\n", localpath);
+ pm_printf(PM_LOG_WARNING, _("could not chdir to download directory %s\n"), localpath);
ret = -1;
goto cleanup;
}
@@ -674,7 +674,7 @@ int download_with_xfercommand(const char *url, const char *localpath,
retval = system(parsedcmd);
if(retval == -1) {
- pm_printf(PM_LOG_WARNING, "running XferCommand: fork failed!\n");
+ pm_printf(PM_LOG_WARNING, _("running XferCommand: fork failed!\n"));
ret = -1;
} else if(retval != 0) {
/* download failed */
diff --git a/src/pacman/query.c b/src/pacman/query.c
index a9717074..6b6a25db 100644
--- a/src/pacman/query.c
+++ b/src/pacman/query.c
@@ -344,7 +344,7 @@ static int check(pmpkg_t *pkg)
if(config->quiet) {
printf("%s %s\n", pkgname, f);
} else {
- pm_printf(PM_LOG_WARNING, "%s: missing %s (%s)\n",
+ pm_printf(PM_LOG_WARNING, "%s: %s (%s)\n",
pkgname, f, strerror(errno));
}
errors++;
@@ -352,7 +352,7 @@ static int check(pmpkg_t *pkg)
}
if(!config->quiet) {
- printf("%s: %d total, %d missing file(s)\n",
+ printf(_("%s: %d total files, %d missing file(s)\n"),
pkgname, allfiles, errors);
}
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 08e977b2..aa09117e 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -674,7 +674,7 @@ static int sync_trans(alpm_list_t *targets)
printf("%s/%s\n", dburl, alpm_pkg_get_filename(pkg));
} else {
/* can't use WARNING here, we don't show warnings in -Sp... */
- pm_fprintf(stderr, PM_LOG_ERROR, _("no database for package: %s\n"),
+ pm_fprintf(stderr, PM_LOG_ERROR, _("no URL for package: %s\n"),
alpm_pkg_get_name(pkg));
}