fix deleteDebianFolder in case the folder does not exist in the first place
authorRalf Jung <post@ralfj.de>
Sun, 27 Oct 2013 20:40:45 +0000 (21:40 +0100)
committerRalf Jung <post@ralfj.de>
Sun, 27 Oct 2013 20:40:45 +0000 (21:40 +0100)
auto_debuild.py

index 11935ef4b1fe27254e77f961e303d8906f13cc38..524603fab73d64c2832326fb8bb0f2cb82cba500 100755 (executable)
@@ -178,22 +178,22 @@ def commandInBuildEnv(config, command):
 def getArchitecture(config):
        cmd = commandInBuildEnv(config, ['dpkg-architecture', '-qDEB_HOST_ARCH'])
        output = subprocess.check_output(cmd)
 def getArchitecture(config):
        cmd = commandInBuildEnv(config, ['dpkg-architecture', '-qDEB_HOST_ARCH'])
        output = subprocess.check_output(cmd)
-       return output.decode('utf-8').strip('\n') # chop of the \n at the end
+       return output.decode('utf-8').strip('\n') # chop off the \n at the end
 
 def writeDependency(f, name, list):
        if len(list):
                print(name+": "+', '.join(list), file=f)
 
 
 def writeDependency(f, name, list):
        if len(list):
                print(name+": "+', '.join(list), file=f)
 
+# actual work functions
 def deleteDebianFolder():
        if os.path.islink('debian'):
                target = os.readlink('debian')
                if os.path.exists(target):
                        shutil.rmtree(target)
                os.remove('debian')
 def deleteDebianFolder():
        if os.path.islink('debian'):
                target = os.readlink('debian')
                if os.path.exists(target):
                        shutil.rmtree(target)
                os.remove('debian')
-       else:
+       elif os.path.exists('debian'):
                shutil.rmtree('debian')
 
                shutil.rmtree('debian')
 
-# actual work functions
 def createDebianFiles(config):
        if not isinstance(config, ConfigDict):
                config = ConfigDict(config)
 def createDebianFiles(config):
        if not isinstance(config, ConfigDict):
                config = ConfigDict(config)