On Thu, 3 Nov 2016 12:29:12 -0700 Zac Medico <zmed...@gentoo.org> wrote:
> On 11/03/2016 12:22 PM, Mike Gilbert wrote: > > Passing -q --unmerged prevents update-index from erroring out when > > local file changes are present. > > > > From git-update-index(1): > > > > -q > > Quiet. If --refresh finds that the index needs an > > update, the default behavior is to error out. This option makes git > > update-index continue anyway. > > > > --unmerged > > If --refresh finds unmerged changes in the index, the > > default behavior is to error out. This option makes git update-index > > continue anyway. > > > > X-Gentoo-Bug-URL: https://bugs.gentoo.org/552814#c58 > > --- > > pym/portage/sync/modules/git/git.py | 5 +---- > > 1 file changed, 1 insertion(+), 4 deletions(-) > > > > diff --git a/pym/portage/sync/modules/git/git.py > > b/pym/portage/sync/modules/git/git.py index dc94ec9..f288733 100644 > > --- a/pym/portage/sync/modules/git/git.py > > +++ b/pym/portage/sync/modules/git/git.py > > @@ -118,10 +118,7 @@ class GitSync(NewBase): > > if exitcode == os.EX_OK and self.repo.sync_depth > > is not None: # update-index --refresh is needed on some filesystems > > # (e.g. with overlayfs on squashfs) > > - update_index_cmd = [self.bin_command, > > 'update-index'] > > - if quiet: # -q needs to go first > > - update_index_cmd.append('-q') > > - update_index_cmd.append('--refresh') > > + update_index_cmd = [self.bin_command, > > 'update-index', '-q', '--unmerged', '--refresh'] > > exitcode = > > subprocess.call(update_index_cmd, > > cwd=portage._unicode_encode(self.repo.location)) > > LGTM. +1 LGTM too -- Brian Dolbec <dolsen>
