Make alternatives useable again from config file

[auto-debuild.git] / auto_debuild.py

diff --git a/auto_debuild.py b/auto_debuild.py
index f9f0672244dde929712cb789ba8da3f8a33f6ea8..5733273c4634e92ca33779b8ba4d730c99b427b3 100755 (executable)
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -1,14 +1,17 @@
 #!/usr/bin/python
-import os, shutil, stat, time, subprocess, sys
+import os, shutil, stat, time, subprocess, sys, shlex
 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))
@@ -27,14 +30,13 @@ def safeCall(*args):
                res += "'"+arg+"'"
        return res
 
-# Load a section-less config file: maps parameter names to strings or lists of strings (which are comma-separated or in separate lines)
+# Load a section-less config file: maps parameter names to space-separated lists of strings (with shell quotation)
 # Lines starting with spaces are continuation lines
 def loadConfigFile(file):
-       import shlex
        # read config file
        linenr = 0
        with open(file) as file:
-               result = AdvancedDict()
+               result = ConfigDict()
                curKey = None
                for line in file:
                        linenr += 1
@@ -51,8 +53,7 @@ def loadConfigFile(file):
                                        # option line
                                        pos = line.index("=") # will raise exception when substring is not found
                                        curKey = line[:pos].strip()
-                                       value = line[pos+1:]
-                                       result[curKey] = shlex.split(value)
+                                       result[curKey] = shlex.split(line[pos+1:]) # shlex.split also strips
                        except Exception:
                                raise Exception("Invalid config, line %d: Error parsing line (quoting issue?)" % linenr)
        # add some convencience get functions
@@ -142,11 +143,18 @@ def pythonRules(config):
        ]
        return r
 
+def noneRules(config):
+       r = RulesFile()
+       r.dh += ["--buildsystem=makefile"] # makefile does the last possible harm
+       r.rules['auto_build'] = []
+       return r
+
 # build systems
 buildSystems = {
        'cmake': BuildSystem(cmakeRules, ["cmake"]),
        'automake': BuildSystem(automakeRules),
        'python': BuildSystem(pythonRules, ["python-setuptools"], ["${python:Depends}"]),
+       'none': BuildSystem(noneRules),
 }
 
 # utility functions
@@ -168,6 +176,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
@@ -252,8 +262,8 @@ def createDebianFiles(config):
                        print >>f, "set -e"
                        print >>f, 'if [ "$1" = "configure" ]; then'
                        for alternative in config.get('alternatives'):
-                               print >>f, safeCall('update-alternatives', '--install', alternative['link'], alternative['name'], alternative['target'],
-                                       str(alternative['priority']))
+                               alternative = shlex.split(alternative)
+                               print >>f, safeCall('update-alternatives', '--install', alternative[0], alternative[1], alternative[2], alternative[3])
                        print >>f, 'fi'
                        print >>f, ''
                        print >>f, '#DEBHELPER#'
@@ -264,7 +274,8 @@ def createDebianFiles(config):
                        print >>f, "set -e"
                        print >>f, 'if [ "$1" = "remove" ]; then'
                        for alternative in config.get('alternatives'):
-                               print >>f, safeCall('update-alternatives', '--remove', alternative['name'], alternative['target'])
+                               alternative = shlex.split(alternative)
+                               print >>f, safeCall('update-alternatives', '--remove', alternative[1], alternative[2])
                        print >>f, 'fi'
                        print >>f, ''
                        print >>f, '#DEBHELPER#'
@@ -307,6 +318,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))