Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/crossdev:master commit in: /
Date: Sat, 30 May 2015 04:46:33
Message-Id: 1432960658.ad3b55a6ebe3af2eb795cdbd9b80ce2bb424ea6c.vapier@gentoo
1 commit: ad3b55a6ebe3af2eb795cdbd9b80ce2bb424ea6c
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 30 04:33:52 2015 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Sat May 30 04:37:38 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=ad3b55a6
7
8 crossdev: use qmerge for unmerging packages
9
10 The latest version of qmerge should be reliable when it comes to unmerge,
11 so start using that when uninstalling targets. It's significantly faster
12 than emerge.
13
14 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
15
16 crossdev | 11 ++---------
17 1 file changed, 2 insertions(+), 9 deletions(-)
18
19 diff --git a/crossdev b/crossdev
20 index 677b5ae..b5f9245 100755
21 --- a/crossdev
22 +++ b/crossdev
23 @@ -416,15 +416,8 @@ uninstall() {
24 rm -f /etc/revdep-rebuild/05cross-${CTARGET}
25 rmdir /etc/revdep-rebuild 2>/dev/null
26
27 - rmdir /var/db/pkg/cross-${CTARGET} 2>/dev/null
28 - if [[ -d /var/db/pkg/cross-${CTARGET} ]] ; then
29 - export CLEAN_DELAY=0
30 - cd /var/db/pkg
31 - local pkgs=( cross-${CTARGET}/* )
32 - emerge -qC ${pkgs[@]/#/=} || exit 1
33 - else
34 - ewarn "${CTARGET}: no packages installed; will clean out known files"
35 - fi
36 + # Unmerge all toolchain packages for this target.
37 + qmerge -Uqy $(qlist -IC "cross-${CTARGET}/")
38
39 # clean out known toolchain files (binutils/gcc)
40 for f in \