commit: 3346d3c1c1f6c2702d7d0d347370bee816a82c2f
Author: Consus <consus <AT> gmx <DOT> com>
AuthorDate: Fri Sep 4 10:20:27 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 4 17:25:24 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=3346d3c1
git sync: Respect PORTAGE_QUIET
Execute `git clone --quiet' and `git pull --quiet' when appropriate.
pym/portage/sync/modules/git/git.py | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/pym/portage/sync/modules/git/git.py
b/pym/portage/sync/modules/git/git.py
index 7a710ef..c14782c 100644
--- a/pym/portage/sync/modules/git/git.py
+++ b/pym/portage/sync/modules/git/git.py
@@ -1,4 +1,4 @@
-# Copyright 2005-2014 Gentoo Foundation
+# Copyright 2005-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import logging
@@ -43,15 +43,18 @@ class GitSync(NewBase):
'Created new directory %s' %
self.repo.location)
except IOError:
return (1, False)
+
sync_uri = self.repo.sync_uri
if sync_uri.startswith("file://"):
sync_uri = sync_uri[6:]
- depth_arg = ''
- if self.repo.sync_depth is not None:
- depth_arg = '--depth %d ' % self.repo.sync_depth
- git_cmd = "%s clone %s%s ." % (self.bin_command, depth_arg,
- portage._shell_quote(sync_uri))
+ git_cmd_opts = ""
+ if self.settings.get("PORTAGE_QUIET") == "1":
+ git_cmd_opts += " --quiet"
+ if self.repo.sync_depth is not None:
+ git_cmd_opts += " --depth %d" % self.repo.sync_depth
+ git_cmd = "%s clone%s %s ." % (self.bin_command, git_cmd_opts,
+ portage._shell_quote(sync_uri))
writemsg_level(git_cmd + "\n")
exitcode = portage.process.spawn_bash("cd %s ; exec %s" % (
@@ -72,7 +75,10 @@ class GitSync(NewBase):
git directly.
'''
- git_cmd = "%s pull" % self.bin_command
+ git_cmd_opts = ""
+ if self.settings.get("PORTAGE_QUIET") == "1":
+ git_cmd_opts += " --quiet"
+ git_cmd = "%s pull%s" % (self.bin_command, git_cmd_opts)
writemsg_level(git_cmd + "\n")
exitcode = portage.process.spawn_bash("cd %s ; exec %s" % (
