Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/repository/storage/
Date: Fri, 28 Sep 2018 05:48:16
Message-Id: 1538113406.b587fc874ce95064139ba85552e146da957cce9e.zmedico@gentoo
1 commit: b587fc874ce95064139ba85552e146da957cce9e
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 28 05:32:31 2018 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 28 05:43:26 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b587fc87
7
8 HardlinkQuarantineRepoStorage: exclude distfiles and packages (bug 666554)
9
10 These paths have been excluded for a long time, and they are also
11 whitelisted in the top-level Manifest.files.gz:
12
13 IGNORE distfiles
14 IGNORE local
15 IGNORE lost+found
16 IGNORE packages
17
18 Bug: https://bugs.gentoo.org/666554
19 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
20
21 lib/portage/repository/storage/hardlink_quarantine.py | 2 ++
22 1 file changed, 2 insertions(+)
23
24 diff --git a/lib/portage/repository/storage/hardlink_quarantine.py b/lib/portage/repository/storage/hardlink_quarantine.py
25 index 7e9cf4493..3594cb1c9 100644
26 --- a/lib/portage/repository/storage/hardlink_quarantine.py
27 +++ b/lib/portage/repository/storage/hardlink_quarantine.py
28 @@ -60,6 +60,7 @@ class HardlinkQuarantineRepoStorage(RepoStorageInterface):
29 # Use rsync --link-dest to hardlink a files into self._update_location,
30 # since cp -l is not portable.
31 yield self._check_call(['rsync', '-a', '--link-dest', self._user_location,
32 + '--exclude=/distfiles', '--exclude=/local', '--exclude=/lost+found', '--exclude=/packages',
33 '--exclude', '/{}'.format(os.path.basename(update_location)),
34 self._user_location + '/', update_location + '/'])
35
36 @@ -78,6 +79,7 @@ class HardlinkQuarantineRepoStorage(RepoStorageInterface):
37 update_location = self.current_update
38 self._update_location = None
39 yield self._check_call(['rsync', '-a', '--delete',
40 + '--exclude=/distfiles', '--exclude=/local', '--exclude=/lost+found', '--exclude=/packages',
41 '--exclude', '/{}'.format(os.path.basename(update_location)),
42 update_location + '/', self._user_location + '/'])