Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Subject: [gentoo-portage-dev] [PATCH] emerge-delta-webrsync: fix bug #506192
Date: Wed, 08 Oct 2014 18:01:31
Message-Id: 54357BF4.6000209@gentoo.org
1 From c7c81d8ec14f3c8fd0e87d9bbfcd572aec480ea0 Mon Sep 17 00:00:00 2001
2 From: Zac Medico <zmedico@g.o>
3 Date: Wed, 8 Oct 2014 10:56:31 -0700
4 Subject: [PATCH] emerge-delta-webrsync: fix bug #506192
5
6 This fixes the sync_local function so that it doesn't prematurely remove
7 the whole TMPDIR when tarsync is not installed. In this case, we really
8 only want to remove the "${TMPDIR}"/portage directory which contains a
9 temporary copy of the portage tree. The faulty code was introduced in
10 commit 24f6a9599bcf445c468022264cd6952aad4d4076 when a bunch of code
11 from emerge-webrsync was merged into emerge-delta-webrsync.
12
13 Fixes: 24f6a9599bcf ("emerge-delta-webrsync: check full snapshot sig")
14 X-Gentoo-Bug: 506192
15 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=506192
16 ---
17 misc/emerge-delta-webrsync | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20 diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync
21 index a412ac8..05a0ac7 100755
22 --- a/misc/emerge-delta-webrsync
23 +++ b/misc/emerge-delta-webrsync
24 @@ -333,7 +333,7 @@ sync_local() {
25 cd "${DISTDIR}"
26
27 __vecho "Cleaning up ..."
28 - rm -fr "${TMPDIR}"
29 + rm -fr "${TMPDIR}"/portage
30 fi
31
32 if has metadata-transfer ${FEATURES} ; then
33 --
34 1.8.5.5