Solaris/buildpkg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do the right thing if someone deleted pkginfo.$secname instead

Browse Source 
of rm -rf'ing the package dir.
This commit is contained in:
Tom G. Christensen 2004-10-08 09:14:05 +00:00
parent f0079c1084
commit 36e25bc278
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildpkg.functions
View File

@ -310,7 +310,7 @@ clean()
META_CLEAN="$META_CLEAN prototype.$secname pkginfo.$secname" META_CLEAN="$META_CLEAN prototype.$secname pkginfo.$secname"
pkgname=$(get_pkgname $secname) pkgname=$(get_pkgname $secname)
echo "Removing $buildpkgbase/$pkgdir/$pkgname" echo "Removing $buildpkgbase/$pkgdir/$pkgname"
$RM -rf $buildpkgbase/$pkgdir/$pkgname [ ! -z "$pkgname" ] && $RM -rf $buildpkgbase/$pkgdir/$pkgname
done done
fi fi

2
buildpkg.packaging.solaris
View File

@ -404,9 +404,11 @@ get_pkgname()
{ {
local secname=$1 local secname=$1
if [ -r $metadir/pkginfo.$secname ]; then
local pn=$($GREP PKG $metadir/pkginfo.$secname) local pn=$($GREP PKG $metadir/pkginfo.$secname)
local pname=$(_upls ${pn##PKG=}) local pname=$(_upls ${pn##PKG=})
echo $pname echo $pname
fi
} }
# get_pkgrev(): Extract pkgrev (REV part of VERSION field) from pkginfo file # get_pkgrev(): Extract pkgrev (REV part of VERSION field) from pkginfo file