From: Holger Levsen <holger@layer-acht.org>
Date: Thu, 15 Sep 2011 10:18:47 +0000 (+0200)
Subject: Merge branch 'master' of ssh://alexandria.profitbricks.localdomain/srv/git/so/jenkins... 
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=55996a438713147bb8784af6c5025199a2a56917;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'master' of ssh://alexandria.profitbricks.localdomain/srv/git/so/jenkins_build_script
---

55996a438713147bb8784af6c5025199a2a56917
diff --cc kernel_inpbuilder.py
index 3572431,752529f..82e3aee
--- a/kernel_inpbuilder.py
+++ b/kernel_inpbuilder.py
@@@ -413,14 -413,13 +413,14 @@@ if __name__ == '__main__'
                  'debian-uploader',
                  'vae6tooZe1ec'
          )
 +        ftp.cwd('/srv/profitbricks-repository/incoming')
  
-         logger.info('FTP Login on %s successfull' %(ftp.host))
+         logger.info('FTP Login on %s successful' %(ftp.host))
  
          if GIT_BRANCH_NAME.startswith('master-'):
 -            ftp.cwd('stable-proposed-updates')
 +            ftp.cwd('production-proposed-updates')
          else:
 -            ftp.cwd('unstable-proposed-updates');
 +            ftp.cwd('pre-staging');
  
          for package in glob(
                  os.path.join(GIT_TARGET_WORKSPACE, '*.deb')