From: Ralf Jung <post@ralfj.de>
Date: Sun, 29 Jul 2012 11:04:11 +0000 (+0200)
Subject: Don't permanently create debian/ folder, and move auto-debuild.conf out of it
X-Git-Url: https://git.ralfj.de/auto-debuild.git/commitdiff_plain/f1454337761d8c6b564d73af342830caeb526678?ds=sidebyside

Don't permanently create debian/ folder, and move auto-debuild.conf out of it
---

diff --git a/auto_debuild.py b/auto_debuild.py
index 90d616d..57ee13b 100755
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import os, stat, time, subprocess, sys
+import os, shutil, stat, time, subprocess, sys
 from collections import OrderedDict
 
 # some utility functions
@@ -100,8 +100,9 @@ def createDebianFiles(config):
 	arch = getArchitecture(config)
 	files = []
 	# create folders
-	if not os.path.exists('debian'): os.mkdir('debian')
-	if not os.path.exists('debian/source'): os.mkdir('debian/source')
+	if os.path.exists('debian'): raise Exception('debian folder already exists?')
+	os.mkdir('debian')
+	os.mkdir('debian/source')
 	if not os.path.exists(debDir): os.mkdir(debDir)
 	# source format file
 	with open('debian/source/format', 'w') as f:
@@ -183,6 +184,7 @@ def buildDebianPackage(config):
 	commands = ['dpkg-checkbuilddeps', 'debian/rules clean', 'debian/rules build', 'fakeroot debian/rules binary', 'debian/rules clean']
 	command = ['nice', 'bash', '-c', ' && '.join(commands)]
 	subprocess.check_call(commandInBuildEnv(config, command))
+	shutil.rmtree('debian') # it only contains what we just created
 
 # all at once
 def createAndInstall(config, overwriteCheck = False):
@@ -204,7 +206,7 @@ def createAndInstall(config, overwriteCheck = False):
 if __name__ == "__main__":
 	# get config
 	import imp
-	config = imp.load_source('config', 'debian/auto-debuild.conf').__dict__
-	os.remove('debian/auto-debuild.confc')
+	config = imp.load_source('config', 'auto-debuild.conf').__dict__
+	os.remove('auto-debuild.confc')
 	# and go for it
 	createAndInstall(config, overwriteCheck=True)