[linux-signed] 02/03: gencontrol.py: Make binary_version a template variable too

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux-signed.

commit 6b3ea383bfc8f31e0d585a840d2d37e6e3aba37c
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Oct 31 10:39:57 2016 -0600

    gencontrol.py: Make binary_version a template variable too
---
 debian/bin/gencontrol.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 3bc95e8..70ecc3e 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -22,6 +22,7 @@ class Gencontrol(Base):
         assert self.version.complete == re.sub(r'\+b\d+$', r'', image_version)
 
         self.abiname = config_entry['abiname']
+        self.binary_version = image_version + signed_version_suffix
         self.vars = {
             'upstreamversion': self.version.linux_upstream,
             'version': self.version.linux_version,
@@ -29,8 +30,8 @@ class Gencontrol(Base):
             'abiname': self.abiname,
             'imageversion': image_version,
             'imagesourceversion': self.version.complete,
+            'binaryversion': self.binary_version,
         }
-        self.binary_version = image_version + signed_version_suffix
 
     def _substitute_file(self, template, vars, target, append=False):
         with codecs.open(target, 'a' if append else 'w', 'utf-8') as f:
@@ -38,7 +39,7 @@ class Gencontrol(Base):
 
     def do_main_setup(self, vars, makeflags, extra):
         makeflags['VERSION'] = self.version.linux_version
-        makeflags['GENCONTROL_ARGS'] = '-v%s' % self.binary_version
+        makeflags['GENCONTROL_ARGS'] = '-v%(binaryversion)s' % vars
         makeflags['PACKAGE_VERSION'] = self.binary_version
 
     def do_main_packages(self, packages, vars, makeflags, extra):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux-signed.git