do not clean again after building

[auto-debuild.git] / auto_debuild.py

diff --git a/auto_debuild.py b/auto_debuild.py
index 11845ded1ace00745ea5002e7b5ad404c02e13c4..4c7e10e2ac2fbafa250012c4c63cf6ad6a3d9cb1 100755 (executable)
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -1,5 +1,22 @@
 #!/usr/bin/python
-import os, shutil, stat, time, subprocess, sys
+# auto-debuild - Automatic Generation of Debian Packages
+# Copyright (C) 2012 Ralf Jung <post@ralfj.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+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 +50,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 +279,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 +291,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#'
@@ -320,7 +337,7 @@ def createDebianFiles(config):
 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']
+       commands = ['dpkg-checkbuilddeps', 'debian/rules clean', 'debian/rules build', 'fakeroot debian/rules binary']
        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))
        shutil.rmtree('debian') # it only contains what we just created