| 1 |
On Fri, 4 Sep 2015 10:20:27 +0000 |
| 2 |
Consus <consus@×××.com> wrote: |
| 3 |
|
| 4 |
> Execute `git clone --quiet' and `git pull --quiet' when appropriate. |
| 5 |
> --- |
| 6 |
> pym/portage/sync/modules/git/git.py | 20 +++++++++++++------- |
| 7 |
> 1 file changed, 13 insertions(+), 7 deletions(-) |
| 8 |
> |
| 9 |
> diff --git a/pym/portage/sync/modules/git/git.py |
| 10 |
> b/pym/portage/sync/modules/git/git.py index 7a710ef..c14782c 100644 |
| 11 |
> --- a/pym/portage/sync/modules/git/git.py |
| 12 |
> +++ b/pym/portage/sync/modules/git/git.py |
| 13 |
> @@ -1,4 +1,4 @@ |
| 14 |
> -# Copyright 2005-2014 Gentoo Foundation |
| 15 |
> +# Copyright 2005-2015 Gentoo Foundation |
| 16 |
> # Distributed under the terms of the GNU General Public License v2 |
| 17 |
> |
| 18 |
> import logging |
| 19 |
> @@ -43,15 +43,18 @@ class GitSync(NewBase): |
| 20 |
> 'Created new directory %s' % |
| 21 |
> self.repo.location) except IOError: |
| 22 |
> return (1, False) |
| 23 |
> + |
| 24 |
> sync_uri = self.repo.sync_uri |
| 25 |
> if sync_uri.startswith("file://"): |
| 26 |
> sync_uri = sync_uri[6:] |
| 27 |
> - depth_arg = '' |
| 28 |
> - if self.repo.sync_depth is not None: |
| 29 |
> - depth_arg = '--depth %d ' % |
| 30 |
> self.repo.sync_depth |
| 31 |
> - git_cmd = "%s clone %s%s ." % (self.bin_command, |
| 32 |
> depth_arg, |
| 33 |
> - portage._shell_quote(sync_uri)) |
| 34 |
> + git_cmd_opts = "" |
| 35 |
> + if self.settings.get("PORTAGE_QUIET") == "1": |
| 36 |
> + git_cmd_opts += " --quiet" |
| 37 |
> + if self.repo.sync_depth is not None: |
| 38 |
> + git_cmd_opts += " --depth %d" % |
| 39 |
> self.repo.sync_depth |
| 40 |
> + git_cmd = "%s clone%s %s ." % (self.bin_command, |
| 41 |
> git_cmd_opts, |
| 42 |
> + portage._shell_quote(sync_uri)) |
| 43 |
> writemsg_level(git_cmd + "\n") |
| 44 |
> |
| 45 |
> exitcode = portage.process.spawn_bash("cd %s ; exec |
| 46 |
> %s" % ( @@ -72,7 +75,10 @@ class GitSync(NewBase): |
| 47 |
> git directly. |
| 48 |
> ''' |
| 49 |
> |
| 50 |
> - git_cmd = "%s pull" % self.bin_command |
| 51 |
> + git_cmd_opts = "" |
| 52 |
> + if self.settings.get("PORTAGE_QUIET") == "1": |
| 53 |
> + git_cmd_opts += " --quiet" |
| 54 |
> + git_cmd = "%s pull%s" % (self.bin_command, |
| 55 |
> git_cmd_opts) writemsg_level(git_cmd + "\n") |
| 56 |
> |
| 57 |
> exitcode = portage.process.spawn_bash("cd %s ; exec |
| 58 |
> %s" % ( |
| 59 |
|
| 60 |
merged and pushed to master |
| 61 |
|
| 62 |
Thank you |
| 63 |
|
| 64 |
-- |
| 65 |
Brian Dolbec <dolsen> |
Archives