| 1 |
commit: 3b77eea12b547a5136cc0bf6153fb0c56e3f154e |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 2 15:28:00 2016 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 2 15:28:00 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=3b77eea1 |
| 7 |
|
| 8 |
crossdev: catch more mkdir/write failures |
| 9 |
|
| 10 |
crossdev | 17 +++++++++-------- |
| 11 |
1 file changed, 9 insertions(+), 8 deletions(-) |
| 12 |
|
| 13 |
diff --git a/crossdev b/crossdev |
| 14 |
index 5cb319c..b3e7bce 100755 |
| 15 |
--- a/crossdev |
| 16 |
+++ b/crossdev |
| 17 |
@@ -19,7 +19,7 @@ source /etc/init.d/functions.sh || exit 1 |
| 18 |
esyslog() { :; } |
| 19 |
die_logs() { |
| 20 |
echo |
| 21 |
- eerror "$1" |
| 22 |
+ eerror "error: $1" |
| 23 |
|
| 24 |
shift |
| 25 |
local log |
| 26 |
@@ -33,6 +33,7 @@ die_logs() { |
| 27 |
} |
| 28 |
die() { die_logs "$*"; } |
| 29 |
has() { [[ " ${@:2} " == *" $1 "* ]]; } |
| 30 |
+xmkdir() { mkdir "$@" || die "could not mkdir $*"; } |
| 31 |
|
| 32 |
usage() { |
| 33 |
local exit_status=${1:-0} |
| 34 |
@@ -400,7 +401,7 @@ setup_portage_vars() { |
| 35 |
|
| 36 |
# make sure we have a valid logdir |
| 37 |
: ${PORT_LOGDIR:=/var/log/portage} |
| 38 |
- mkdir -p "${PORT_LOGDIR}" |
| 39 |
+ xmkdir -p "${PORT_LOGDIR}" |
| 40 |
} |
| 41 |
|
| 42 |
uninstall() { |
| 43 |
@@ -1038,7 +1039,7 @@ set_metadata() { |
| 44 |
repo_name=$(cat "${f}" 2>/dev/null) |
| 45 |
: ${repo_name:="crossdev"} |
| 46 |
|
| 47 |
- mkdir -p "${meta}" |
| 48 |
+ xmkdir -p "${meta}" |
| 49 |
if [[ -e ${layout} ]] ; then |
| 50 |
if ! grep -qs "^${autogen_tag}" "${layout}" ; then |
| 51 |
einfo "leaving metadata/layout.conf alone in ${CROSSDEV_OVERLAY}" |
| 52 |
@@ -1093,7 +1094,7 @@ set_metadata() { |
| 53 |
done |
| 54 |
|
| 55 |
# write out that layout.conf! |
| 56 |
- cat <<-EOF > "${layout}" |
| 57 |
+ cat <<-EOF > "${layout}" || die "could not write ${layout}" |
| 58 |
${autogen_tag} |
| 59 |
# Delete the above line if you want to manage this file yourself |
| 60 |
masters = ${masters% } |
| 61 |
@@ -1102,7 +1103,7 @@ set_metadata() { |
| 62 |
EOF |
| 63 |
} |
| 64 |
|
| 65 |
-mkdir -p "${CONFIGROOT}" "${CROSSDEV_OVERLAY}"/{cross-${CTARGET},profiles} || die "wtf!?" |
| 66 |
+xmkdir -p "${CONFIGROOT}" "${CROSSDEV_OVERLAY}"/{cross-${CTARGET},profiles} |
| 67 |
for f in "${CONFIGROOT}" "${CROSSDEV_OVERLAY}"/profiles ; do |
| 68 |
f+="/categories" |
| 69 |
check_trailing_newline "${f}" |
| 70 |
@@ -1112,7 +1113,7 @@ done |
| 71 |
cd "${CONFIGROOT}" || die "wtf!?" |
| 72 |
for f in package.{env,keywords,mask,use} env/cross-${CTARGET} profile/package.use.{force,mask} ; do |
| 73 |
[[ -f ${f} ]] && die "please convert ${CONFIGROOT}/${f} to a directory" |
| 74 |
- mkdir -p "${f}" || die "wtf!?" |
| 75 |
+ xmkdir -p "${f}" |
| 76 |
rm -f "${f}/cross-${CTARGET}" |
| 77 |
done |
| 78 |
|
| 79 |
@@ -1123,7 +1124,7 @@ for_each_extra_pkg set_portage X |
| 80 |
set_metadata |
| 81 |
|
| 82 |
# filter out revdep rebuild stuff #182601 |
| 83 |
-mkdir -p /etc/revdep-rebuild |
| 84 |
+xmkdir -p /etc/revdep-rebuild |
| 85 |
echo "SEARCH_DIRS_MASK=/usr/${CTARGET}" > /etc/revdep-rebuild/05cross-${CTARGET} |
| 86 |
|
| 87 |
hr |
| 88 |
@@ -1131,7 +1132,7 @@ hr |
| 89 |
####################################### |
| 90 |
### Create links for helper scripts ### |
| 91 |
|
| 92 |
-mkdir -p /usr/${CTARGET} |
| 93 |
+xmkdir -p /usr/${CTARGET} |
| 94 |
emerge-wrapper --target ${CTARGET} --init || exit 1 |
| 95 |
|
| 96 |
################# |
Archives