jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

commit: don't ask questions if simulating

cute-signatures
Timo Teräs 2013-08-03 17:31:49 +03:00
parent ed06091189
commit 065427f417
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/commit.c
View File

@ -249,18 +249,19 @@ int apk_solver_commit_changeset(struct apk_database *db,
size_unit = 'M'; size_unit = 'M';
} }
if (apk_verbosity > 1 || (apk_flags & APK_INTERACTIVE)) { if ((apk_verbosity > 1 || (apk_flags & APK_INTERACTIVE)) &&
!(apk_flags & APK_SIMULATE)) {
r = dump_packages(changeset, cmp_remove, r = dump_packages(changeset, cmp_remove,
"The following packages will be REMOVED"); "The following packages will be REMOVED");
r += dump_packages(changeset, cmp_downgrade, r += dump_packages(changeset, cmp_downgrade,
"The following packages will be DOWNGRADED"); "The following packages will be DOWNGRADED");
if (r || (apk_flags & APK_INTERACTIVE) || apk_verbosity > 2) { if (r || (apk_flags & APK_INTERACTIVE) || apk_verbosity > 2) {
dump_packages(changeset, cmp_new, r += dump_packages(changeset, cmp_new,
"The following NEW packages will be installed"); "The following NEW packages will be installed");
dump_packages(changeset, cmp_upgrade, r += dump_packages(changeset, cmp_upgrade,
"The following packages will be upgraded"); "The following packages will be upgraded");
dump_packages(changeset, cmp_reinstall, r += dump_packages(changeset, cmp_reinstall,
"The following packages will be reinstalled"); "The following packages will be reinstalled");
printf("After this operation, %zd %ciB of %s.\n", printf("After this operation, %zd %ciB of %s.\n",
(size_diff < 0) ? -size_diff : size_diff, (size_diff < 0) ? -size_diff : size_diff,
size_unit, size_unit,
@ -268,8 +269,7 @@ int apk_solver_commit_changeset(struct apk_database *db,
"disk space will be freed" : "disk space will be freed" :
"additional disk space will be used"); "additional disk space will be used");
} }
if (changeset->num_total_changes > 0 && if (r > 0 && (apk_flags & APK_INTERACTIVE)) {
(apk_flags & APK_INTERACTIVE)) {
printf("Do you want to continue [Y/n]? "); printf("Do you want to continue [Y/n]? ");
fflush(stdout); fflush(stdout);
r = fgetc(stdin); r = fgetc(stdin);