[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, experimental, updated. debian/2.1.1-1_experimental1-51-g95835b7

[Garrett Holmstrom]

The following commit has been merged in the experimental branch:
commit 4e2a8fdea4db441de1729c90fd0b37259d275b7c
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Fri Aug 10 16:12:58 2012 -0700

    Print the eucalyptus version when it is present

diff --git a/euca2ools/commands/eucacommand.py b/euca2ools/commands/eucacommand.py
index 0e46ea7..3a5a488 100644
--- a/euca2ools/commands/eucacommand.py
+++ b/euca2ools/commands/eucacommand.py
@@ -301,6 +301,9 @@ class EucaCommand(object):
 
     def version(self):
         print 'euca2ools %s (%s)' % (euca2ools.__version__, euca2ools.__codename__)
+        if os.path.isfile('/etc/eucalyptus/eucalyptus-version'):
+            with open('/etc/eucalyptus/eucalyptus-version') as version_file:
+                print 'eucalyptus %s' % version_file.readline().strip()
         sys.exit(0)
 
     def param_usage(self, plist, label, n=30):
diff --git a/euca2ools/utils.py b/euca2ools/utils.py
index f48a4b1..859e14a 100644
--- a/euca2ools/utils.py
+++ b/euca2ools/utils.py
@@ -31,6 +31,7 @@
 # Author: Neil Soman neil at eucalyptus.com
 #         Mitch Garnaat mgarnaat at eucalyptus.com
 
+import os.path
 import subprocess
 import sys
 from euca2ools import exceptions, __version__, __codename__
@@ -122,4 +123,7 @@ def print_version_if_necessary():
     """
     if '--version' in sys.argv:
         print 'euca2ools %s (%s)' % (__version__, __codename__)
+        if os.path.isfile('/etc/eucalyptus/eucalyptus-version'):
+            with open('/etc/eucalyptus/eucalyptus-version') as version_file:
+                print 'eucalyptus %s' % version_file.readline().strip()
         sys.exit()

-- 
managing cloud instances for Eucalyptus