From ec8de51a7c1fbd32f802c138c2ea199714ad9b8a Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 9 Nov 2011 16:43:50 +0100 Subject: [PATCH] git rid of GIT_OLD_ID and _NEW_ID --- kernel_build.py | 4 ---- kernel_inpbuilder.py | 26 -------------------------- 2 files changed, 30 deletions(-) diff --git a/kernel_build.py b/kernel_build.py index f21f274..f5a7e7a 100644 --- a/kernel_build.py +++ b/kernel_build.py @@ -20,8 +20,6 @@ BUILD_URL = os.environ.get('BUILD_URL') GIT_REPO_PATH = os.environ.get('GIT_REPO_PATH') GIT_REPO_NAME = os.path.basename(GIT_REPO_PATH) -GIT_OLD_ID = os.environ.get('GIT_OLD_ID') -GIT_NEW_ID = os.environ.get('GIT_NEW_ID') GIT_BRANCH_NAME = os.environ.get('GIT_BRANCH_NAME') GIT_COMMITTER_EMAIL = os.environ.get('GIT_COMMITTER_EMAIL') @@ -62,8 +60,6 @@ def build_kernel_with_pbuilder(revision, pbuilder_script, dist='stable'): '--build-url', '%s' %(BUILD_URL), '--git-repo-path', '%s' %(GIT_REPO_PATH), '--git-repo-name', '%s' %(GIT_REPO_NAME), - '--git-old-id', '%s' %(GIT_OLD_ID), - '--git-new-id', '%s' %(GIT_NEW_ID), '--git-branch-name', '%s' %(GIT_BRANCH_NAME), '--revision', '%s' %(revision), '--dist', '%s' %(dist), diff --git a/kernel_inpbuilder.py b/kernel_inpbuilder.py index 75face2..efe1297 100644 --- a/kernel_inpbuilder.py +++ b/kernel_inpbuilder.py @@ -88,22 +88,6 @@ def getopts(): help='Set the Git Repo Name. Default: %default' ) - parser.add_option( - '--git-old-id', - dest='git_old_id', - default=None, - metavar='GIT_OLD_ID', - help='Set the Git Old Id. Default: %default' - ) - - parser.add_option( - '--git-new-id', - dest='git_new_id', - default=None, - metavar='GIT_NEW_ID', - help='Set the Git New Id. Default: %default' - ) - parser.add_option( '--git-branch-name', dest='git_branch_name', @@ -366,16 +350,6 @@ if __name__ == '__main__': logger.error('No git repo path given') exit(ERROR) - GIT_OLD_ID = os.environ.get('GIT_OLD_ID') or options.git_old_id - if not GIT_OLD_ID: - logger.error('No git old id given') - exit(ERROR) - - GIT_NEW_ID = os.environ.get('GIT_NEW_ID') or options.git_new_id - if not GIT_NEW_ID: - logger.error('No git new id given') - exit(ERROR) - OVERLAY_DIR = options.overlay_dir or '/usr/share/kernel-package' # add current dir to python search path -- 2.39.5