From 8d6f5281b6f105449515b33ac4c35c0d4a278c1a Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 18 Nov 2012 22:29:06 +0100 Subject: [PATCH] Make alternatives useable again from config file --- auto_debuild.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/auto_debuild.py b/auto_debuild.py index 11845de..5733273 100755 --- a/auto_debuild.py +++ b/auto_debuild.py @@ -1,5 +1,5 @@ #!/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 @@ -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): - import shlex # read config file linenr = 0 with open(file) as file: @@ -263,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#' @@ -275,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#' -- 2.30.2