Gentoo Archives: gentoo-commits

From: "Christian Ruppert (idl0r)" <idl0r@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoolkit r765 - in trunk/gentoolkit: . bin
Date: Thu, 01 Apr 2010 15:03:37
Message-Id: E1NxLvj-0001US-J4@stork.gentoo.org
1 Author: idl0r
2 Date: 2010-04-01 15:03:35 +0000 (Thu, 01 Apr 2010)
3 New Revision: 765
4
5 Modified:
6 trunk/gentoolkit/ChangeLog
7 trunk/gentoolkit/bin/revdep-rebuild
8 Log:
9 revdep-rebuild: Use EMERGE_OPTIONS _after_ EMERGE_DEFAULT_OPTS to allow overwriting,
10 bug 307023, thanks to Albert W. Hopkins <marduk@××××××.net>.
11
12
13 Modified: trunk/gentoolkit/ChangeLog
14 ===================================================================
15 --- trunk/gentoolkit/ChangeLog 2010-04-01 14:41:20 UTC (rev 764)
16 +++ trunk/gentoolkit/ChangeLog 2010-04-01 15:03:35 UTC (rev 765)
17 @@ -1,3 +1,7 @@
18 +2010-04-01: Christian Ruppert <idl0r@g.o>
19 + * revdep-rebuild: Use EMERGE_OPTIONS _after_ EMERGE_DEFAULT_OPTS,
20 + bug 307023, thanks to Albert W. Hopkins <marduk@××××××.net>.
21 +
22 2010-03-31: Christian Ruppert <idl0r@g.o>
23 * epkginfo: Fix epkginfo to handle ambiguous package names.
24 * revdep-rebuild: Check if $ERRORS_FILE exist before running gawk on it.
25
26 Modified: trunk/gentoolkit/bin/revdep-rebuild
27 ===================================================================
28 --- trunk/gentoolkit/bin/revdep-rebuild 2010-04-01 14:41:20 UTC (rev 764)
29 +++ trunk/gentoolkit/bin/revdep-rebuild 2010-04-01 15:03:35 UTC (rev 765)
30 @@ -1113,7 +1113,7 @@
31 trap - SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM
32
33 einfo 'All prepared. Starting rebuild'
34 - echo "emerge --oneshot ${EMERGE_OPTIONS[@]} ${EMERGE_DEFAULT_OPTS} $REBUILD_LIST"
35 + echo "emerge --oneshot ${EMERGE_DEFAULT_OPTS} ${EMERGE_OPTIONS[@]} $REBUILD_LIST"
36
37 is_real_merge && countdown 10
38
39 @@ -1122,7 +1122,7 @@
40
41 # Run in background to correctly handle Ctrl-C
42 {
43 - emerge --oneshot ${EMERGE_OPTIONS[@]} ${EMERGE_DEFAULT_OPTS} $REBUILD_LIST <&6
44 + emerge --oneshot ${EMERGE_DEFAULT_OPTS} ${EMERGE_OPTIONS[@]} $REBUILD_LIST <&6
45 echo $? > "$STATUS_FILE"
46 } &
47 wait