summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNagy Gabor <ngaba@bibl.u-szeged.hu>2010-01-19 21:35:13 +0100
committerDan McGee <dan@archlinux.org>2010-01-20 05:14:12 +0100
commit27bc2f7eb81566370f9f19f89eb95c6e6c9ec49a (patch)
tree619f7168de9bb93aef08b9314fbde6156a440f2c
parent0eadc992400aaad58da5866d23caee01a22e1341 (diff)
downloadpacman-27bc2f7eb81566370f9f19f89eb95c6e6c9ec49a.tar.gz
pacman-27bc2f7eb81566370f9f19f89eb95c6e6c9ec49a.tar.xz
Print "there is nothing to do" with NOOP transactions
The "local database is up to date" message has been replaced with "there is nothing to do" message. This used with "empty" -S, -R, -U operations too. (Examples: pacman -S ignored_pkg, pacman -Ru needed_pkg.) See FS#17859. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--src/pacman/remove.c1
-rw-r--r--src/pacman/sync.c2
-rw-r--r--src/pacman/upgrade.c1
3 files changed, 3 insertions, 1 deletions
diff --git a/src/pacman/remove.c b/src/pacman/remove.c
index 6d44350b..61b57c77 100644
--- a/src/pacman/remove.c
+++ b/src/pacman/remove.c
@@ -118,6 +118,7 @@ int pacman_remove(alpm_list_t *targets)
/* Step 3: actually perform the removal */
alpm_list_t *pkglist = alpm_trans_get_remove();
if(pkglist == NULL) {
+ printf(_(" there is nothing to do\n"));
goto cleanup; /* we are done */
}
/* print targets and ask user confirmation */
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index a2ef616d..24acf5f8 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -663,7 +663,7 @@ static int sync_trans(alpm_list_t *targets)
packages = alpm_trans_get_add();
if(packages == NULL) {
/* nothing to do: just exit without complaining */
- printf(_(" local database is up to date\n"));
+ printf(_(" there is nothing to do\n"));
goto cleanup;
}
diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c
index 57c7b790..ddb47964 100644
--- a/src/pacman/upgrade.c
+++ b/src/pacman/upgrade.c
@@ -132,6 +132,7 @@ int pacman_upgrade(alpm_list_t *targets)
/* print targets and ask user confirmation */
alpm_list_t *packages = alpm_trans_get_add();
if(packages == NULL) { /* we are done */
+ printf(_(" there is nothing to do\n"));
trans_release();
return(retval);
}