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

fix the whitespace - tabs->spaces

Browse source
This commit is contained in:
Luke Meyer 2013-04-24 09:30:32 -04:00
parent c8e9b941ab
commit 8fafa710f4
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/tito/builder.py
View file

@ -404,7 +404,7 @@ class Builder(ConfigObject):
self.tgz_filename, self.tgz_filename,
) )
run_command(cmd) 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 self.ran_setup_test_specfile = True
def _get_rpmbuild_dir_options(self): def _get_rpmbuild_dir_options(self):

4
src/tito/cli.py
View file

@ -626,8 +626,8 @@ class ReleaseModule(BaseCliModule):
target=target, target=target,
releaser_config=releaser_config, releaser_config=releaser_config,
no_cleanup=self.options.no_cleanup, no_cleanup=self.options.no_cleanup,
test=self.options.test, test=self.options.test,
auto_accept=self.options.auto_accept) auto_accept=self.options.auto_accept)
releaser.release(dry_run=self.options.dry_run, releaser.release(dry_run=self.options.dry_run,
no_build=self.options.no_build, no_build=self.options.no_build,
scratch=self.options.scratch) scratch=self.options.scratch)

18
src/tito/release.py
View file

@ -53,8 +53,8 @@ class Releaser(object):
target=None, releaser_config=None, no_cleanup=False, test=False, auto_accept=False): target=None, releaser_config=None, no_cleanup=False, test=False, auto_accept=False):
self.builder_args = self._parse_builder_args(releaser_config, target) self.builder_args = self._parse_builder_args(releaser_config, target)
if test: if test:
self.builder_args['test'] = True # builder must know to build from HEAD 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 # While we create a builder here, we don't actually call run on it
# unless the releaser needs to: # unless the releaser needs to:
@ -89,11 +89,11 @@ class Releaser(object):
self._check_releaser_config() self._check_releaser_config()
def _ask_yes_no(self, prompt="Y/N? ", default_auto_answer=True): def _ask_yes_no(self, prompt="Y/N? ", default_auto_answer=True):
if self.auto_accept: if self.auto_accept:
return default_auto_answer return default_auto_answer
else: else:
answer = raw_input(prompt) answer = raw_input(prompt)
return answer.lower() in ['y', 'yes', 'ok', 'sure'] return answer.lower() in ['y', 'yes', 'ok', 'sure']
def _check_releaser_config(self): 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])) run_command("%s switch-branch %s" % (self.cli_tool, self.git_branches[0]))
self.builder.tgz() self.builder.tgz()
if self.test: if self.test:
self.builder._setup_test_specfile() self.builder._setup_test_specfile()
self._git_sync_files(project_checkout) self._git_sync_files(project_checkout)
self._git_upload_sources(project_checkout) self._git_upload_sources(project_checkout)
@ -555,7 +555,7 @@ class FedoraGitReleaser(Releaser):
print(diff_output) print(diff_output)
print("") print("")
print("##### Please review the above diff #####") 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!") print("Fine, you're on your own!")
self.cleanup() self.cleanup()
sys.exit(1) sys.exit(1)
@ -898,7 +898,7 @@ class CvsReleaser(Releaser):
print("") print("")
print("###############################") 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) debug("Opening editor for user to edit commit message in: %s" % name)
editor = 'vi' editor = 'vi'
if "EDITOR" in os.environ: if "EDITOR" in os.environ: