Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 78734 Details for
Bug 121317
helpers should do error checking
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
an attempt to fix the issue
helpers_error_checking.patch (text/plain), 6.70 KB, created by
Simon Stelling (RETIRED)
on 2006-02-02 09:52:35 UTC
(
hide
)
Description:
an attempt to fix the issue
Filename:
MIME Type:
Creator:
Simon Stelling (RETIRED)
Created:
2006-02-02 09:52:35 UTC
Size:
6.70 KB
patch
obsolete
>Index: dodoc >=================================================================== >--- dodoc (revision 2618) >+++ dodoc (working copy) >@@ -9,14 +9,14 @@ > > dir="${D}usr/share/doc/${PF}/${DOCDESTTREE}" > if [ ! -d "${dir}" ] ; then >- install -d "${dir}" >+ install -d "${dir}" || exit 2 > fi > > ret=0 > for x in "$@" ; do > if [ -s "${x}" ] ; then >- install -m0644 "${x}" "${dir}" >- gzip -f -9 "${dir}/${x##*/}" >+ install -m0644 "${x}" "${dir}" || exit 3 >+ gzip -f -9 "${dir}/${x##*/}" || exit 4 > elif [ ! -e "${x}" ] ; then > echo "dodoc: ${x} does not exist" 1>&2 > ((++ret)) >Index: doman >=================================================================== >--- doman (revision 2618) >+++ doman (working copy) >@@ -36,13 +36,13 @@ > if echo ${mandir} | egrep -q 'man[0-9n](|f|p|pm)$' -; then > if [ -s "${x}" ] ; then > if [ ! -d "${D}${BASE}/man/${mandir}" ] ; then >- install -d "${D}${BASE}/man/${mandir}" >+ install -d "${D}${BASE}/man/${mandir}" || exit 2 > fi > >- install -m0644 "${x}" "${D}${BASE}/man/${mandir}" >+ install -m0644 "${x}" "${D}${BASE}/man/${mandir}" || exit 3 > > if [ -z "${compressed}" ] ; then >- gzip -f -9 "${D}${BASE}/man/${mandir}/${x##*/}" >+ gzip -f -9 "${D}${BASE}/man/${mandir}/${x##*/}" || exit 4 > fi > else > echo "doman: ${x} does not exist" 1>&2 >Index: domo >=================================================================== >--- domo (revision 2618) >+++ domo (working copy) >@@ -9,7 +9,7 @@ > exit 1 > fi > if [ ! -d "${D}${DESTTREE}/share/locale" ] ; then >- install -d "${D}${DESTTREE}/share/locale/" >+ install -d "${D}${DESTTREE}/share/locale/" || exit 1 > fi > > for x in "$@" ; do >@@ -17,9 +17,9 @@ > mytiny="${x##*/}" > mydir="${D}${DESTTREE}/share/locale/${mytiny%.*}/LC_MESSAGES" > if [ ! -d "${mydir}" ] ; then >- install -d "${mydir}" >+ install -d "${mydir}" || exit 2 > fi >- install -m0644 "${x}" "${mydir}/${MOPREFIX}.mo" >+ install -m0644 "${x}" "${mydir}/${MOPREFIX}.mo" || exit 3 > else > echo "${0}: ${x} does not exist" > fi >Index: dosed >=================================================================== >--- dosed (revision 2618) >+++ dosed (working copy) >@@ -11,7 +11,7 @@ > if [ -f "${y}" ] ; then > mysrc="${T}/${y##*/}" > cp "${y}" "${mysrc}" >- sed -e "${mysed}" "${mysrc}" > "${y}" >+ sed -e "${mysed}" "${mysrc}" > "${y}" || exit 2 > else > echo "${y} is not a regular file!" > exit 1 >Index: doconfd >=================================================================== >--- doconfd (revision 2618) >+++ doconfd (working copy) >@@ -10,6 +10,6 @@ > > tmp_INSDESTTREE="${INSDESTTREE}" > INSDESTTREE=/etc/conf.d/ >-doins "$@" >+doins "$@" || exit 2 > INSDESTTREE="${tmp_INSDESTTREE}" > unset tmp_INSDESTTREE >Index: doinfo >=================================================================== >--- doinfo (revision 2618) >+++ doinfo (working copy) >@@ -8,13 +8,13 @@ > exit 1 > fi > if [ ! -d "${D}usr/share/info" ] ; then >- install -d "${D}usr/share/info" >+ install -d "${D}usr/share/info" || exit 2 > fi > > for x in "$@" ; do > if [ -e "${x}" ] ; then >- install -m0644 "${x}" "${D}usr/share/info" >- gzip -f -9 "${D}usr/share/info/${x##*/}" >+ install -m0644 "${x}" "${D}usr/share/info" || exit 3 >+ gzip -f -9 "${D}usr/share/info/${x##*/}" || exit 4 > else > echo "doinfo: ${x} does not exist" > fi >Index: doenvd >=================================================================== >--- doenvd (revision 2618) >+++ doenvd (working copy) >@@ -10,6 +10,6 @@ > > tmp_INSDESTTREE="${INSDESTTREE}" > INSDESTTREE=/etc/env.d/ >-doins "$@" >+doins "$@" || exit 1 > INSDESTTREE="${tmp_INSDESTTREE}" > unset tmp_INSDESTTREE >Index: doins >=================================================================== >--- doins (revision 2618) >+++ doins (working copy) >@@ -28,7 +28,9 @@ > #exit 1 > fi > >-[ ! -d "${D}${INSDESTTREE}" ] && dodir "${INSDESTTREE}" >+if [ ! -d "${D}${INSDESTTREE}" ]; then >+ dodir "${INSDESTTREE}" || exit 2 >+fi > > for x in "$@" ; do > if [ -L "$x" ] ; then >@@ -44,10 +46,10 @@ > env \ > INSDESTTREE="${mydir}" \ > INSDEPTH=$((INSDEPTH+1)) \ >- doins -r {} \; >+ doins -r {} \; || exit 3 > continue > else > mysrc="${x}" > fi >- install ${INSOPTIONS} "${mysrc}" "${D}${INSDESTTREE}" >+ install ${INSOPTIONS} "${mysrc}" "${D}${INSDESTTREE}" || exit 4 > done >Index: dolib >=================================================================== >--- dolib (revision 2618) >+++ dolib (working copy) >@@ -25,13 +25,13 @@ > exit 1 > fi > if [ ! -d "${libdir}" ] ; then >- install -d "${libdir}" >+ install -d "${libdir}" || exit 1 > fi > > for x in "$@" ; do > if [ -e "${x}" ] ; then > if [ ! -L "${x}" ] ; then >- install ${LIBOPTIONS} "${x}" "${libdir}" >+ install ${LIBOPTIONS} "${x}" "${libdir}" || exit 2 > else > ln -s "$(readlink "${x}")" "${libdir}/${x}" > fi >Index: doinitd >=================================================================== >--- doinitd (revision 2618) >+++ doinitd (working copy) >@@ -10,6 +10,6 @@ > > tmp_EXEDESTTREE="${EXEDESTTREE}" > EXEDESTTREE=/etc/init.d/ >-doexe "$@" >+doexe "$@" || exit 1 > EXEDESTTREE="${tmp_EXEDESTTREE}" > unset tmp_EXEDESTTREE >Index: dojar >=================================================================== >--- dojar (revision 2618) >+++ dojar (working copy) >@@ -34,7 +34,7 @@ > jardest="${DESTTREE}/share/${PN}/${JARDESTTREE}/" > pf="${D}${jarroot}/package.env" > >-dodir "${jardest}" >+dodir "${jardest}" || exit 1 > > for i in $* ; do > bn="$(basename $i)" >@@ -50,5 +50,5 @@ > fi > > cp "$i" "${D}${jardest}/" >- chmod 0444 "${D}${jardest}/${bn}" >+ chmod 0444 "${D}${jardest}/${bn}" || exit 2 > done >Index: dodir >=================================================================== >--- dodir (revision 2618) >+++ dodir (working copy) >@@ -4,5 +4,5 @@ > # $Id: /var/cvsroot/gentoo-src/portage/bin/dodir,v 1.5 2004/10/04 13:56:50 vapier Exp $ > > for x in "$@" ; do >- install -d ${DIROPTIONS} "${D}${x}" >+ install -d ${DIROPTIONS} "${D}${x}" || exit 1 > done >Index: doexe >=================================================================== >--- doexe (revision 2618) >+++ doexe (working copy) >@@ -3,24 +3,23 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Id: /var/cvsroot/gentoo-src/portage/bin/doexe,v 1.10.2.1 2004/12/06 03:01:43 carpaski Exp $ > >-mynum=${#} >-if [ ${mynum} -lt 1 ] ; then >+if [ ${#} -lt 1 ] ; then > echo "doexe: at least one argument needed" > exit 1 > fi > if [ ! -d "${D}${EXEDESTTREE}" ] ; then >- install -d "${D}${EXEDESTTREE}" >+ install -d "${D}${EXEDESTTREE}" || exit 2 > fi > >-for x in "$@" ; do >+for x in "${@}" ; do > if [ -L "${x}" ] ; then > cp "${x}" "${T}" >- mysrc="${T}"/`/usr/bin/basename "${x}"` >+ mysrc="${T}"/$(/usr/bin/basename "${x}") > elif [ -d "${x}" ] ; then > echo "doexe: warning, skipping directory ${x}" > continue > else > mysrc="${x}" > fi >- install ${EXEOPTIONS} "${mysrc}" "${D}${EXEDESTTREE}" >+ install ${EXEOPTIONS} "${mysrc}" "${D}${EXEDESTTREE}" || exit 3 > done
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 121317
:
78734
|
78796