Make alternatives useable again from config file

[auto-debuild.git] / auto_debuild.py

diff --git a/auto_debuild.py b/auto_debuild.py
index 5239e67903ae963656d4ebfd546f194d3873839d..5733273c4634e92ca33779b8ba4d730c99b427b3 100755 (executable)
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
 #!/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 which can convert types and handle one-element lists like their single member
 from collections import OrderedDict
 
 # a dict with some useful additional getters which can convert types and handle one-element lists like their single member


@@ -33,7 +33,6 @@ def safeCall(*args):
 # 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):
 # 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:
        # read config file
        linenr = 0
        with open(file) as file:


@@ -54,8 +53,7 @@ def loadConfigFile(file):
                                        # option line
                                        pos = line.index("=") # will raise exception when substring is not found
                                        curKey = line[:pos].strip()
                                        # 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
                        except Exception:
                                raise Exception("Invalid config, line %d: Error parsing line (quoting issue?)" % linenr)
        # add some convencience get functions


@@ -145,11 +143,18 @@ def pythonRules(config):
        ]
        return r
 
        ]
        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}"]),
 # build systems
 buildSystems = {
        'cmake': BuildSystem(cmakeRules, ["cmake"]),
        'automake': BuildSystem(automakeRules),
        'python': BuildSystem(pythonRules, ["python-setuptools"], ["${python:Depends}"]),

+       'none': BuildSystem(noneRules),

 }
 
 # utility functions
 }
 
 # utility functions


@@ -257,8 +262,8 @@ def createDebianFiles(config):
                        print >>f, "set -e"
                        print >>f, 'if [ "$1" = "configure" ]; then'
                        for alternative in config.get('alternatives'):
                        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#'
                        print >>f, 'fi'
                        print >>f, ''
                        print >>f, '#DEBHELPER#'


@@ -269,7 +274,8 @@ def createDebianFiles(config):
                        print >>f, "set -e"
                        print >>f, 'if [ "$1" = "remove" ]; then'
                        for alternative in config.get('alternatives'):
                        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#'
                        print >>f, 'fi'
                        print >>f, ''
                        print >>f, '#DEBHELPER#'