Merge lp:~andreserl/maas/lp1563094 into lp:~maas-committers/maas/trunk

[Andres Rodriguez]

Fix determination of installed version.

=== modified file 'src/maasserver/utils/version.py'
--- src/maasserver/utils/version.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/utils/version.py	2016-03-29 16:41:47 +0000
@@ -17,7 +17,7 @@
 apt_pkg.init()
 
 # Name of maas package to get version from.
-REGION_PACKAGE_NAME = "maas-region-controller-min"
+REGION_PACKAGE_NAME = "maas-region-api"
 
 
 def get_version_from_apt(package):
@@ -61,9 +61,11 @@
     try:
         revno = shell.call_and_check(("bzr", "revno", __file__))
     except shell.ExternalProcessError:
-        # We may not be in a Bazaar working tree, or Bazaar is not installed,
-        # or any manner of other errors. For the purposes of this function we
-        # don't care; simply say we don't know.
+        # We may not be in a Bazaar working tree, or any manner of other errors.
+        # For the purposes of this function we don't care; simply say we don't know.
+        return None
+    except FileNotFoundError:
+        # Bazaar is not installed. We don't care and simply say we don't know.
         return None
     else:
         # `bzr revno` can return '???' when it can't find the working tree's

=== modified file 'utilities/remote-reinstall'
--- utilities/remote-reinstall	2016-03-25 14:52:23 +0000
+++ utilities/remote-reinstall	2016-03-29 16:41:47 +0000
@@ -28,7 +28,7 @@
 ssh_run="ssh -oBatchMode=yes -l root $hostname"
 
 echo "Checking $hostname..."
-maas_version=$($ssh_run "dpkg -s maas-region-controller-min | grep ^Version") \
+maas_version=$($ssh_run "dpkg -s maas-region-api | grep ^Version") \
     || die "Cannot SSH to root@$hostname."
 ip_address=$(get_ip $hostname)
 maas_version=$(echo $maas_version | cut -d':' -f 2)