Gentoo Archives: gentoo-portage-dev

From: Mike Gilbert <floppym@g.o>
To: gentoo-portage-dev@l.g.o
Subject: [gentoo-portage-dev] [PATCH] sync: always pass -q to git-update-index
Date: Wed, 02 Nov 2016 21:10:10
Message-Id: 20161102210956.23023-1-floppym@gentoo.org
1 The -q option allows git-update-index to succeed even if there are
2 locally modified files present.
3
4 X-Gentoo-Bug-URL: https://bugs.gentoo.org/552814#c58
5 ---
6 pym/portage/sync/modules/git/git.py | 5 +----
7 1 file changed, 1 insertion(+), 4 deletions(-)
8
9 diff --git a/pym/portage/sync/modules/git/git.py b/pym/portage/sync/modules/git/git.py
10 index dc94ec9..3db6dc1 100644
11 --- a/pym/portage/sync/modules/git/git.py
12 +++ b/pym/portage/sync/modules/git/git.py
13 @@ -118,10 +118,7 @@ class GitSync(NewBase):
14 if exitcode == os.EX_OK and self.repo.sync_depth is not None:
15 # update-index --refresh is needed on some filesystems
16 # (e.g. with overlayfs on squashfs)
17 - update_index_cmd = [self.bin_command, 'update-index']
18 - if quiet: # -q needs to go first
19 - update_index_cmd.append('-q')
20 - update_index_cmd.append('--refresh')
21 + update_index_cmd = [self.bin_command, 'update-index', '-q', '--refresh']
22
23 exitcode = subprocess.call(update_index_cmd,
24 cwd=portage._unicode_encode(self.repo.location))
25 --
26 2.10.2

Replies