emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-install: fixed some issues; remove unused headers.

Browse Source
This commit is contained in:
Juan RP 2012-11-02 15:24:48 +01:00
parent b05ce9fe57
commit a0d4a21a1d
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/xbps-install/main.c
View File

@ -215,10 +215,10 @@ main(int argc, char **argv)
goto out; goto out;
} }
if (update && !argc) { if (update && (argc == optind)) {
/* Update all installed packages */ /* Update all installed packages */
rv = dist_upgrade(&xh, maxcols, yes, drun); rv = dist_upgrade(&xh, maxcols, yes, drun);
} else if (update && argc) { } else if (update) {
/* Update target packages */ /* Update target packages */
for (i = optind; i < argc; i++) { for (i = optind; i < argc; i++) {
rv = update_pkg(&xh, argv[i]); rv = update_pkg(&xh, argv[i]);
@ -226,7 +226,7 @@ main(int argc, char **argv)
goto out; goto out;
} }
rv = exec_transaction(&xh, maxcols, yes, drun); rv = exec_transaction(&xh, maxcols, yes, drun);
} else if (!update && argc) { } else if (!update) {
/* Install target packages */ /* Install target packages */
for (i = optind; i < argc; i++) { for (i = optind; i < argc; i++) {
rv = install_new_pkg(&xh, argv[i], reinstall); rv = install_new_pkg(&xh, argv[i], reinstall);

2
bin/xbps-install/transaction.c
View File

@ -34,9 +34,7 @@
#include <limits.h> #include <limits.h>
#include <xbps_api.h> #include <xbps_api.h>
#include "compat.h"
#include "defs.h" #include "defs.h"
#include "../xbps-repo/defs.h"
struct transaction { struct transaction {
prop_dictionary_t d; prop_dictionary_t d;