From a0d4a21a1d600cb64b58eb8f0ceb7ab4a69b59eb Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 2 Nov 2012 15:24:48 +0100 Subject: [PATCH] xbps-install: fixed some issues; remove unused headers. --- bin/xbps-install/main.c | 6 +++--- bin/xbps-install/transaction.c | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/bin/xbps-install/main.c b/bin/xbps-install/main.c index 2638d272..fb868dd5 100644 --- a/bin/xbps-install/main.c +++ b/bin/xbps-install/main.c @@ -215,10 +215,10 @@ main(int argc, char **argv) goto out; } - if (update && !argc) { + if (update && (argc == optind)) { /* Update all installed packages */ rv = dist_upgrade(&xh, maxcols, yes, drun); - } else if (update && argc) { + } else if (update) { /* Update target packages */ for (i = optind; i < argc; i++) { rv = update_pkg(&xh, argv[i]); @@ -226,7 +226,7 @@ main(int argc, char **argv) goto out; } rv = exec_transaction(&xh, maxcols, yes, drun); - } else if (!update && argc) { + } else if (!update) { /* Install target packages */ for (i = optind; i < argc; i++) { rv = install_new_pkg(&xh, argv[i], reinstall); diff --git a/bin/xbps-install/transaction.c b/bin/xbps-install/transaction.c index a8e14a70..ed306354 100644 --- a/bin/xbps-install/transaction.c +++ b/bin/xbps-install/transaction.c @@ -34,9 +34,7 @@ #include #include -#include "compat.h" #include "defs.h" -#include "../xbps-repo/defs.h" struct transaction { prop_dictionary_t d;