Merge lp:~sinzui/juju-release-tools/ignroe-epoch into lp:juju-release-tools

[Curtis Hovey]

Strip the epoch from the base_version when making aagents

We saw this error after debs were download and they were extracted to convert the jujud into an agent

OSError: [Errno 2] No such file or directory: '/tmp/tmpNlQsjT/contents/usr/lib/juju-1:2.0.0/bin/jujud'

^ lib/juju-1:2.0.0 should be lib/juju-2.0

The epoch was not stripped, corrupting both the base_version and the major_minor.

[Curtis Hovey (sinzui)]

This works with
    control_version = "1:2.0.0-0ubuntu1~16.10.1~juju1"
and
    control_version = "2.0.0-0ubuntu1~16.10.1~juju1"

[Nicholas Skaggs (nskaggs)]

Thank you!

review: Approve

=== modified file 'generate_agents.py'
--- generate_agents.py	2016-07-15 22:07:02 +0000
+++ generate_agents.py	2016-10-13 22:22:13 +0000
@@ -119,7 +119,8 @@
                                            'control'])
     control = deb822.Deb822(control_str)
     control_version = control['Version']
-    base_version = re.sub('(~|-0ubuntu).*$', '', control_version)
+    epoch_version = re.sub('(~|-0ubuntu).*$', '', control_version)
+    base_version = re.sub('^.:', '', epoch_version)
     major_minor = '.'.join(base_version.split('-')[0].split('.')[0:2])
     series = juju_series.get_name_from_package_version(control_version)
     architecture = control['Architecture']