[virt-tools-list] [PATCH virt-viewer 1/4] Revert "virt-viewer-main: exit when domain names doesn't match"

Pavel Grunt pgrunt at redhat.com
Tue Apr 14 15:45:53 UTC 2015


This reverts commit 10264d0d1ecbd67d3e59e3a1a3032936b0635eda.

Commit a830275344c88aef12166661b68ea2b4429c7212 required the domain
name to be placed just after the '--wait' option. It breaked the
command line api, because running 'virt-viewer $vm --wait' was considered
as the error.

Related: rhbz#1209398, rhbz#1211573
---
 src/virt-viewer-main.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/virt-viewer-main.c b/src/virt-viewer-main.c
index 638087f..8c1ca80 100644
--- a/src/virt-viewer-main.c
+++ b/src/virt-viewer-main.c
@@ -108,11 +108,6 @@ int main(int argc, char **argv)
         goto cleanup;
     }
 
-    if (args && waitvm != NULL && g_strcmp0(waitvm, args[0]) != 0) {
-        g_printerr(_("\nDomain names mismatch, got '%s' and '%s'\n\n%s\n\n"), waitvm, args[0], help_msg);
-        goto cleanup;
-    }
-
     viewer = virt_viewer_new(uri, (args) ? args[0] : waitvm, direct, attach, waitvm != NULL, reconnect);
     if (viewer == NULL)
         goto cleanup;
-- 
2.3.5




More information about the virt-tools-list mailing list