From 8fafa710f4a37d28f8d2d4433b19a6e896bfc90a Mon Sep 17 00:00:00 2001 From: Luke Meyer Date: Wed, 24 Apr 2013 09:30:32 -0400 Subject: [PATCH] fix the whitespace - tabs->spaces --- src/tito/builder.py | 2 +- src/tito/cli.py | 4 ++-- src/tito/release.py | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/tito/builder.py b/src/tito/builder.py index 06df1ff..eb0f906 100644 --- a/src/tito/builder.py +++ b/src/tito/builder.py @@ -404,7 +404,7 @@ class Builder(ConfigObject): self.tgz_filename, ) run_command(cmd) - self.build_version += ".git." + str(self.commit_count) + "." + str(self.git_commit_id[:7]) + self.build_version += ".git." + str(self.commit_count) + "." + str(self.git_commit_id[:7]) self.ran_setup_test_specfile = True def _get_rpmbuild_dir_options(self): diff --git a/src/tito/cli.py b/src/tito/cli.py index 2321f02..a7b495d 100644 --- a/src/tito/cli.py +++ b/src/tito/cli.py @@ -626,8 +626,8 @@ class ReleaseModule(BaseCliModule): target=target, releaser_config=releaser_config, no_cleanup=self.options.no_cleanup, - test=self.options.test, - auto_accept=self.options.auto_accept) + test=self.options.test, + auto_accept=self.options.auto_accept) releaser.release(dry_run=self.options.dry_run, no_build=self.options.no_build, scratch=self.options.scratch) diff --git a/src/tito/release.py b/src/tito/release.py index ca4b5e1..5c8db7f 100644 --- a/src/tito/release.py +++ b/src/tito/release.py @@ -53,8 +53,8 @@ class Releaser(object): target=None, releaser_config=None, no_cleanup=False, test=False, auto_accept=False): self.builder_args = self._parse_builder_args(releaser_config, target) - if test: - self.builder_args['test'] = True # builder must know to build from HEAD + if test: + self.builder_args['test'] = True # builder must know to build from HEAD # While we create a builder here, we don't actually call run on it # unless the releaser needs to: @@ -89,11 +89,11 @@ class Releaser(object): self._check_releaser_config() def _ask_yes_no(self, prompt="Y/N? ", default_auto_answer=True): - if self.auto_accept: + if self.auto_accept: return default_auto_answer else: - answer = raw_input(prompt) - return answer.lower() in ['y', 'yes', 'ok', 'sure'] + answer = raw_input(prompt) + return answer.lower() in ['y', 'yes', 'ok', 'sure'] def _check_releaser_config(self): """ @@ -487,8 +487,8 @@ class FedoraGitReleaser(Releaser): run_command("%s switch-branch %s" % (self.cli_tool, self.git_branches[0])) self.builder.tgz() - if self.test: - self.builder._setup_test_specfile() + if self.test: + self.builder._setup_test_specfile() self._git_sync_files(project_checkout) self._git_upload_sources(project_checkout) @@ -555,7 +555,7 @@ class FedoraGitReleaser(Releaser): print(diff_output) print("") print("##### Please review the above diff #####") - if not self._ask_yes_no("Do you wish to proceed with commit? [y/n] "): + if not self._ask_yes_no("Do you wish to proceed with commit? [y/n] "): print("Fine, you're on your own!") self.cleanup() sys.exit(1) @@ -898,7 +898,7 @@ class CvsReleaser(Releaser): print("") print("###############################") print("") - if self._ask_yes_no("Would you like to edit this commit message? [y/n] ", False): + if self._ask_yes_no("Would you like to edit this commit message? [y/n] ", False): debug("Opening editor for user to edit commit message in: %s" % name) editor = 'vi' if "EDITOR" in os.environ: