Merge ~sespiros/ubuntu-security-tools/+git/ubuntu-security-tools:esm-chroot-names-2 into ubuntu-security-tools:master

[Spyros Seimenis]

[Spyros Seimenis (sespiros)]

Some context and discussion can be found in my previous MR https://code.launchpad.net/~sespiros/ubuntu-security-tools/+git/ubuntu-security-tools/+merge/424290

[Alex Murray (alexmurray)]

This looks like a good usability improvement since in general all packages published to ESM have 'esm' in the version and so should be built in ESM chroots.

review: Approve

diff --git a/build-tools/umt b/build-tools/umt
index 24beb0b..a2b8f9f 100755
--- a/build-tools/umt
+++ b/build-tools/umt
@@ -637,10 +637,18 @@ def perform_binary_build(details, opt):
     if opt.hardening:
         extra_deps.append('hardening-wrapper')
 
-    details['chroot'] = "%s-i386" % details['release']
+    chroot = details['release']
+
+    if 'esm' in details['version']:
+        chroot += "-esm"
+
     (rc, arch) = runcmd(['uname', '-m'])
     if arch.strip() == "x86_64":
-        details['chroot'] = "%s-amd64" % details['release']
+        chroot += "-amd64"
+    else:
+        chroot += "-i386"
+
+    details['chroot'] = chroot
 
     if opt.chroot:
         details['chroot'] = opt.chroot