From ed23d0471cbf02f06fe5b7496d47d3da4b790de9 Mon Sep 17 00:00:00 2001 From: Vasilis Liaskovitis Date: Tue, 31 Jan 2012 19:41:01 +0100 Subject: [PATCH] Revert "added feature branch support" This reverts commit f27a70c4bd9051c80f84bf1141986f75bbb7ab49. --- kernel_inpbuilder.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/kernel_inpbuilder.py b/kernel_inpbuilder.py index 81c6bdb..66905fe 100644 --- a/kernel_inpbuilder.py +++ b/kernel_inpbuilder.py @@ -266,8 +266,6 @@ def determine_kernel_flavour(): debian_version = '$(version)-%s+%s' % (pb_version, REVISION) elif GIT_BRANCH_NAME.startswith('release') or GIT_BRANCH_NAME.startswith('hotfix'): debian_version = '$(version)-%s~rc%s' % (pb_version, REVISION) - elif GIT_BRANCH_NAME.startswith('feature'): - debian_version = '$(version)-%s~experimental%s' % (pb_version, REVISION) else: debian_version = '$(version)-%s~develop%s' % (pb_version, REVISION) @@ -316,6 +314,7 @@ def install_extra_modules(): return True + if __name__ == '__main__': logger = logging.getLogger(sys.argv[0]) logger.setLevel(logging.DEBUG) @@ -445,10 +444,7 @@ if __name__ == '__main__': logger.error('Cannot login via ftp...') exit(ERROR) - if GIT_BRANCH_NAME.startswith('feature'): - ftp.cwd('/srv/dev-repository/incoming') - else: - ftp.cwd('/srv/profitbricks-repository/incoming') + ftp.cwd('/srv/profitbricks-repository/incoming') logger.info('FTP Login on %s successful' %(ftp.host)) @@ -456,8 +452,6 @@ if __name__ == '__main__': ftp.cwd('production-proposed-updates') elif GIT_BRANCH_NAME.startswith('release/') or GIT_BRANCH_NAME.startswith('hotfix/'): ftp.cwd('staging'); - elif GIT_BRANCH_NAME.startswith('feature'): - ftp.cwd('experimental'); else: ftp.cwd('pre-staging'); logger.info('FTP working directory: %s' %(ftp.pwd())) -- 2.39.5