1 |
commit: a0721f00c837abdc835843dc44d23a967d96dba4 |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 1 00:18:09 2012 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 1 05:27:36 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/crossdev.git;a=commit;h=a0721f00 |
7 |
|
8 |
crossdev: reject flat files in PORTAGE_CONFIGROOT |
9 |
|
10 |
It's getting to be too much of a hassle to support flat files in |
11 |
PORTAGE_CONFIGROOT (I'm lazy), so start rejecting setups that try |
12 |
to do that. It's trivial for people to convert over to dirs. |
13 |
|
14 |
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org> |
15 |
|
16 |
--- |
17 |
crossdev | 14 +++++--------- |
18 |
1 files changed, 5 insertions(+), 9 deletions(-) |
19 |
|
20 |
diff --git a/crossdev b/crossdev |
21 |
index 65bd433..1c9a5b7 100755 |
22 |
--- a/crossdev |
23 |
+++ b/crossdev |
24 |
@@ -310,14 +310,10 @@ uninstall() { |
25 |
|
26 |
[[ -d ${CROSSDEV_OVERLAY}/cross-${CTARGET} ]] \ |
27 |
&& rm -r ${CROSSDEV_OVERLAY}/cross-${CTARGET} |
28 |
+ local f |
29 |
for f in categories package.{mask,keywords,use} profile/package.use.{force,mask} ; do |
30 |
- f="${CONFIGROOT}/${f}" |
31 |
- if [[ -d ${f} ]] ; then |
32 |
- rm -f "${f}"/cross-${CTARGET} |
33 |
- rmdir "${f}" 2>/dev/null |
34 |
- elif [[ -f ${f} ]] ; then |
35 |
- sed -i -r -e "/^cross-${CTARGET}(\/|$)/d" "${f}" |
36 |
- fi |
37 |
+ rm -f "${f}"/cross-${CTARGET} |
38 |
+ rmdir "${f}" 2>/dev/null |
39 |
done |
40 |
rm -rf "${CONFIGROOT}"/env/cross-${CTARGET} |
41 |
rmdir "${CONFIGROOT}"/env 2>/dev/null |
42 |
@@ -899,8 +895,8 @@ grep -qs "^cross-${CTARGET}$" "${CONFIGROOT}"/categories \ |
43 |
mkdir -p "${CROSSDEV_OVERLAY}"/cross-${CTARGET} || exit 1 |
44 |
cd "${CONFIGROOT}" |
45 |
for f in package.{keywords,mask,use} env/cross-${CTARGET} profile/package.use.{force,mask} ; do |
46 |
- [[ -f ${f} ]] && continue |
47 |
- mkdir -p ${f} || exit 1 |
48 |
+ [[ -f ${f} ]] && die "please convert ${CONFIGROOT}/${f} to a directory" |
49 |
+ mkdir -p ${f} || die "wtf!?" |
50 |
rm -f ${f}/cross-${CTARGET} |
51 |
done |