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

Really fix #53 this time: with or without -n.

Browse Source
This commit is contained in:
Juan RP 2014-08-23 16:25:51 +02:00
parent 5a1919e520
commit bc92b387cb
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,9 +236,10 @@ main(int argc, char **argv)
rv = exec_transaction(&xh, maxcols, yes, drun); rv = exec_transaction(&xh, maxcols, yes, drun);
} else if (!update) { } else if (!update) {
/* Install target packages */ /* Install target packages */
int npkgs = argc - optind;
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);
if (optind >= 2 && rv == EEXIST) { if (npkgs >= 2 && rv == EEXIST) {
rv = 0; rv = 0;
} else if (rv != 0) { } else if (rv != 0) {
xbps_pkgdb_unlock(&xh); xbps_pkgdb_unlock(&xh);

8
tests/xbps/xbps-install/behaviour_tests.sh
View File

@ -22,9 +22,13 @@ install_existent_body() {
cd .. cd ..
xbps-install -r root -C empty.conf --repository=$PWD/some_repo -y A xbps-install -r root -C empty.conf --repository=$PWD/some_repo -y A
atf_check_equal $? 0 atf_check_equal $? 0
xbps-install -r root -C empty.conf --repository=$PWD/some_repo -yn A B xbps-install -r root -C empty.conf --repository=$PWD/some_repo -y A B
atf_check_equal $? 0 atf_check_equal $? 0
xbps-install -r root -C empty.conf --repository=$PWD/some_repo -yn B A
rm -r root
xbps-install -r root -C empty.conf --repository=$PWD/some_repo -y A
atf_check_equal $? 0
xbps-install -r root -C empty.conf --repository=$PWD/some_repo -y B A
atf_check_equal $? 0 atf_check_equal $? 0
} }