In response to Nelson's bug report, actually give a useful error if a

machine is on, but the command is invalid

svn path=/trunk/packages/sipb-xen-remote-server/; revision=1159

diff --git a/debian/changelog b/debian/changelog
index ee59165..910bbfe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sipb-xen-remote-server (0.10) unstable; urgency=low
+
+  * If a command is invalid, but the machine's on, give an actually useful
+    error message
+
+ -- Evan Broder <broder@mit.edu>  Wed, 22 Oct 2008 00:29:50 -0400
+

 sipb-xen-remote-server (0.9.2) unstable; urgency=low
 
   * Expose an interface to the autoinstaller over remctl
 sipb-xen-remote-server (0.9.2) unstable; urgency=low
 
   * Expose an interface to the autoinstaller over remctl

diff --git a/files/usr/sbin/sipb-xen-remote-control b/files/usr/sbin/sipb-xen-remote-control
index e61cb72..3ee3e70 100755 (executable)
--- a/files/usr/sbin/sipb-xen-remote-control
+++ b/files/usr/sbin/sipb-xen-remote-control
@@ -30,7 +30,7 @@ def main(argv):
               stdout=PIPE, stderr=PIPE)
     (out, err) = p.communicate()
     if p.returncode == 1:
               stdout=PIPE, stderr=PIPE)
     (out, err) = p.communicate()
     if p.returncode == 1:

-        print >>sys.stderr, "machine '%s' is not on" % machine_name
+        print >>sys.stderr, "ERROR: invalid command"

         return 1
     sys.stderr.write(err)
     sys.stdout.write(out)
         return 1
     sys.stderr.write(err)
     sys.stdout.write(out)