# HG changeset patch
# User Cole Robinson <crobinso@redhat.com>
# Date 1260461104 18000
# Node ID dcabeb876e3939082288efbed35ceb9f4e5d7b0b
# Parent  645bde011e4965740f23e8bfbb15053b36541686
virt-install: Fix --prompt if --disk also specified

diff -r 645bde011e49 -r dcabeb876e39 virt-install
--- a/virt-install	Thu Dec 10 10:45:41 2009 -0500
+++ b/virt-install	Thu Dec 10 11:05:04 2009 -0500
@@ -269,13 +269,6 @@
 
 def get_disk(disk, size, sparse, guest, conn, is_file_path):
 
-    # If user specified --disk, disable prompting for the whole validation
-    # process, since falling back to prompting likely wouldn't provide
-    # sufficient options.
-    orig_prompt = cli.doprompt
-    if not is_file_path:
-        cli.set_prompt(False)
-
     try:
         if is_file_path:
             kwargs = { 'conn': conn, 'path': disk, 'size': size,
@@ -290,7 +283,6 @@
         fail(_("Error with storage parameters: %s" % str(e)))
 
     guest.disks.append(d)
-    cli.set_prompt(orig_prompt)
 
 def get_disks(file_paths, disk_paths, size, sparse, nodisks, guest, conn):
     if nodisks:
@@ -303,7 +295,7 @@
     elif not file_paths and not disk_paths and not cli.is_prompt():
         fail(_("A disk must be specified (use --nodisks to override)"))
 
-    is_file_path = ((file_paths or cli.is_prompt()) or False)
+    is_file_path = (file_paths or (not disk_paths and cli.is_prompt()))
     disk = (file_paths or disk_paths)
 
     # ensure we have equal length lists