summaryrefslogtreecommitdiff
path: root/files.c
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2014-04-08 09:48:59 -0700
committerAaron Plattner <aplattner@nvidia.com>2014-04-08 09:48:59 -0700
commit734efd3a0959650fee628ebb54bd07a85a784ccf (patch)
tree0175e8e93519ff0770c1a71621d2b2ee22aa4627 /files.c
parentd0b611041d8ad79dd0a102833885f984d5a16ad6 (diff)
337.12337.12
Diffstat (limited to 'files.c')
-rw-r--r--files.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/files.c b/files.c
index c5af2df..592b9c8 100644
--- a/files.c
+++ b/files.c
@@ -1580,18 +1580,15 @@ int check_for_existing_rpms(Options *op)
nvfree(cmd);
if (ret == 0) {
-
- const char *choices[2] = {
- "Continue installation",
- "Abort installation"
- };
-
- if (ui_multiple_choice(op, choices, 2, 0, "An %s rpm appears to "
- "already be installed on your system. As "
- "part of installing the new driver, this %s "
- "rpm will be uninstalled. Are you sure you "
- "want to continue?",
- rpms[i], rpms[i]) == 1) {
+ if (ui_multiple_choice(op, CONTINUE_ABORT_CHOICES,
+ NUM_CONTINUE_ABORT_CHOICES,
+ CONTINUE_CHOICE, /* Default choice */
+ "An %s rpm appears to already be installed "
+ "on your system. As part of installing the "
+ "new driver, this %s rpm will be "
+ "uninstalled. Are you sure you want to "
+ "continue?",
+ rpms[i], rpms[i]) == ABORT_CHOICE) {
ui_log(op, "Installation aborted.");
return FALSE;
}