entrouvert
/
eobuilder
17
0
Fork 0
Code Issues Pull Requests Releases Activity

pass --quiet to a serie of git commands

This commit is contained in:
Frédéric Péters 2015-08-19 22:59:13 +02:00
parent 7a48d3f29b
commit 050d90e75e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eobuilder-ctl
View File

@ -157,7 +157,7 @@ def prepare_build(dist, project, cmd_options, new):
error('no debian/ directory, -> unsupported', exit_code=2)
print "!!! WARNING obsolete: using a branch for debian/ packaging"
print "+ Updating Debian branch for %s" % dist
call("git checkout %s" % debian_branch)
call("git checkout --quiet %s" % debian_branch)
call("git pull")
else:
print "+ Building from %s debian folder" % debian_folder
@ -198,12 +198,12 @@ def prepare_build(dist, project, cmd_options, new):
new_inc)
else:
version_suffix = "-1~eob%s+1" % settings.DEBIAN_VERSIONS[dist]
call("git checkout %s" % build_branch)
call("git checkout --quiet %s" % build_branch)
changelog = '\n'.join(changelog_from_git(package['source_name'],
version_suffix, project['git_path'], package['repository']))
if changelog:
if not os.path.isdir(debian_folder):
call("git checkout %s" % debian_branch)
call("git checkout --quiet %s" % debian_branch)
debian_generated_changelog_filename = debian_changelog + '.generated'
with open(debian_generated_changelog_filename, 'w+') as f:
f.write(changelog)
@ -247,7 +247,7 @@ def prepare_build(dist, project, cmd_options, new):
if not os.path.exists(origin_archive):
print "+ Generating origin tarball ..."
os.chdir(project['git_path'])
call("git checkout %s" % build_branch)
call("git checkout --quiet %s" % build_branch)
if os.path.exists('setup.py'):
call("python setup.py clean --all")
call("python setup.py sdist --formats=bztar")
@ -265,7 +265,7 @@ def prepare_build(dist, project, cmd_options, new):
print "+ Preparing Debian build (%s %s) ..." % (package['source_name'], package['version'])
if debian_branch:
call("git checkout " + debian_branch)
call("git checkout --quiet %s" % debian_branch)
os.chdir(project['build_dir'])
project_build_path = os.path.join(project['build_dir'],
"%s-%s" % (project['name'], project['version']))
@ -369,7 +369,7 @@ def send_packages(dist, arch, project, package, last_tag):
def clean_git_on_exit(git_project_path):
os.chdir(git_project_path)
call("git stash")
call("git stash --quiet")
changelog_tmp = os.path.join(
git_project_path,
"debian", "changelog.git"
@ -394,7 +394,7 @@ def main():
shutil.rmtree(git_project_path)
if os.path.exists(git_project_path):
os.chdir(git_project_path)
call("git checkout %s" % options.branch)
call("git checkout --quiet %s" % options.branch)
call("git reset --hard origin/%s" % options.branch)
last_tag = output("git describe --abbrev=0 --tags --match=v*",
exit_on_error=False)
@ -414,7 +414,7 @@ def main():
new = 1
print "+ Updating git repository and parsing configuration ..."
os.chdir(git_project_path)
call("git checkout %s" % options.branch)
call("git checkout --quiet %s" % options.branch)
call("git pull")
project = get_project_infos(git_project_path, options)