From: Ralf Jung Date: Fri, 5 Oct 2012 13:03:18 +0000 (+0200) Subject: Allow calling the external functions with normal dicts X-Git-Url: https://git.ralfj.de/auto-debuild.git/commitdiff_plain/7edde71e46e2fad736d7d10e1b34f540a5b14c66 Allow calling the external functions with normal dicts --- diff --git a/auto_debuild.py b/auto_debuild.py index f9f0672..e629a23 100755 --- a/auto_debuild.py +++ b/auto_debuild.py @@ -2,13 +2,16 @@ import os, shutil, stat, time, subprocess, sys from collections import OrderedDict -# a dict with some useful additional getters -class AdvancedDict(dict): +# a dict with some useful additional getters which can convert types and handle one-element lists like their single member +class ConfigDict(dict): def getstr(self, name, default = None): if not name in self: return default val = self[name] - if len(val) != 1: raise Exception('%s is a list, but it should not' % name) - return val[0] + if isinstance(val, list): + if len(val) != 1: raise Exception('%s is a list, but it should not' % name) + return val[0] + else: + return val def getint(self, name, default = None): return int(self.getstr(name, default)) @@ -34,7 +37,7 @@ def loadConfigFile(file): # read config file linenr = 0 with open(file) as file: - result = AdvancedDict() + result = ConfigDict() curKey = None for line in file: linenr += 1 @@ -168,6 +171,8 @@ def writeDependency(f, name, list): # actual work functions def createDebianFiles(config): + if not isinstance(config, ConfigDict): + config = ConfigDict(config) sourceName = config.getstr('sourceName') binaryName = config.getstr('binaryName', sourceName+'-local') name = config.getstr('name', os.getenv('USER')) # os.getlogin() fails in minimal chroots @@ -307,6 +312,8 @@ def createDebianFiles(config): return files def buildDebianPackage(config): + if not isinstance(config, ConfigDict): + config = ConfigDict(config) commands = ['dpkg-checkbuilddeps', 'debian/rules clean', 'debian/rules build', 'fakeroot debian/rules binary', 'debian/rules clean'] command = ['bash', '-c', ' && '.join(commands)] # make it all one command, so we don't have to open and close the chroot too often subprocess.check_call(commandInBuildEnv(config, command))