From 356184c428686948124e9d38bd2575d8578005b0 Mon Sep 17 00:00:00 2001 From: Alex Wood Date: Fri, 12 Jun 2015 13:36:09 -0400 Subject: [PATCH] Correct style errors and use all caps for user_config option. --- src/tito/builder/main.py | 3 ++- src/tito/tagger/main.py | 4 ++-- test/unit/common_tests.py | 2 -- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/tito/builder/main.py b/src/tito/builder/main.py index ccdc151..148eaa4 100644 --- a/src/tito/builder/main.py +++ b/src/tito/builder/main.py @@ -28,7 +28,7 @@ from tito.common import scl_to_rpm_option, get_latest_tagged_version, \ find_wrote_in_rpmbuild_output, debug, error_out, run_command_print, \ find_spec_file, run_command, get_build_commit, get_relative_project_dir, \ get_relative_project_dir_cwd, get_spec_version_and_release, \ - check_tag_exists, create_tgz, get_script_path, get_latest_commit, \ + check_tag_exists, create_tgz, get_latest_commit, \ get_commit_count, find_gemspec_file, create_builder, compare_version,\ find_cheetah_template_file, render_cheetah, replace_spec_release, \ find_spec_like_file, warn_out, get_commit_timestamp, chdir, mkdir_p, \ @@ -975,6 +975,7 @@ class MeadBuilder(Builder): 'all_artifacts': all_artifacts, 'all_artifacts_with_path': all_artifacts_with_path, } + debug("Cheetah input: %s" % cheetah_input) render_cheetah(find_cheetah_template_file(self.start_dir), self.rpmbuild_gitcopy, cheetah_input) self.spec_file_name = find_spec_file(self.rpmbuild_gitcopy) else: diff --git a/src/tito/tagger/main.py b/src/tito/tagger/main.py index 2d5b534..06683f3 100644 --- a/src/tito/tagger/main.py +++ b/src/tito/tagger/main.py @@ -338,8 +338,8 @@ class VersionTagger(ConfigObject): mvn_new_version = new_version.split('-')[0] maven_args = ['-B'] - if 'maven_args' in self.user_config: - maven_args.append(self.user_config['maven_args']) + if 'MAVEN_ARGS' in self.user_config: + maven_args.append(self.user_config['MAVEN_ARGS']) else: maven_args.append('-q') diff --git a/test/unit/common_tests.py b/test/unit/common_tests.py index 3cfab60..03f5c8d 100644 --- a/test/unit/common_tests.py +++ b/test/unit/common_tests.py @@ -288,7 +288,6 @@ class SpecTransformTest(unittest.TestCase): sha = "acecafe" commit_count = 5 - display_version = "git-%s.%s" % (commit_count, sha) munge_specfile(self.spec_file, sha, commit_count) output = open(self.spec_file, 'r').readlines() @@ -307,7 +306,6 @@ class SpecTransformTest(unittest.TestCase): sha = "acecafe" commit_count = 5 - display_version = "git-%s.%s" % (commit_count, sha) munge_specfile(self.spec_file, sha, commit_count) output = open(self.spec_file, 'r').readlines()