release-engineering/tito
1
0
Fork 0
mirror of https://github.com/rpm-software-management/tito.git synced 2025-02-23 20:22:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct style errors and use all caps for user_config option.

Browse source
This commit is contained in:
Alex Wood 2015-06-12 13:36:09 -04:00
parent d73ab2d661
commit 356184c428
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/tito/builder/main.py
View file

@ -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_wrote_in_rpmbuild_output, debug, error_out, run_command_print, \
find_spec_file, run_command, get_build_commit, get_relative_project_dir, \ find_spec_file, run_command, get_build_commit, get_relative_project_dir, \
get_relative_project_dir_cwd, get_spec_version_and_release, \ 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,\ get_commit_count, find_gemspec_file, create_builder, compare_version,\
find_cheetah_template_file, render_cheetah, replace_spec_release, \ find_cheetah_template_file, render_cheetah, replace_spec_release, \
find_spec_like_file, warn_out, get_commit_timestamp, chdir, mkdir_p, \ 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': all_artifacts,
'all_artifacts_with_path': all_artifacts_with_path, '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) render_cheetah(find_cheetah_template_file(self.start_dir), self.rpmbuild_gitcopy, cheetah_input)
self.spec_file_name = find_spec_file(self.rpmbuild_gitcopy) self.spec_file_name = find_spec_file(self.rpmbuild_gitcopy)
else: else:

4
src/tito/tagger/main.py
View file

@ -338,8 +338,8 @@ class VersionTagger(ConfigObject):
mvn_new_version = new_version.split('-')[0] mvn_new_version = new_version.split('-')[0]
maven_args = ['-B'] maven_args = ['-B']
if 'maven_args' in self.user_config: if 'MAVEN_ARGS' in self.user_config:
maven_args.append(self.user_config['maven_args']) maven_args.append(self.user_config['MAVEN_ARGS'])
else: else:
maven_args.append('-q') maven_args.append('-q')

2
test/unit/common_tests.py
View file

@ -288,7 +288,6 @@ class SpecTransformTest(unittest.TestCase):
sha = "acecafe" sha = "acecafe"
commit_count = 5 commit_count = 5
display_version = "git-%s.%s" % (commit_count, sha)
munge_specfile(self.spec_file, sha, commit_count) munge_specfile(self.spec_file, sha, commit_count)
output = open(self.spec_file, 'r').readlines() output = open(self.spec_file, 'r').readlines()
@ -307,7 +306,6 @@ class SpecTransformTest(unittest.TestCase):
sha = "acecafe" sha = "acecafe"
commit_count = 5 commit_count = 5
display_version = "git-%s.%s" % (commit_count, sha)
munge_specfile(self.spec_file, sha, commit_count) munge_specfile(self.spec_file, sha, commit_count)
output = open(self.spec_file, 'r').readlines() output = open(self.spec_file, 'r').readlines()