PoetryInCode/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

shutils/metadata.sh: fix multiple inclusion of subpkg templates.

Browse Source 
--HG--
extra : convert_revision : 2a1d8c9996d1790817c672e66293be3b63480768
This commit is contained in:
Juan RP 2009-11-23 02:13:21 +00:00
parent 16808930aa
commit ff49f2b52a
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xbps-src/shutils/metadata.sh
View File

@ -46,19 +46,18 @@ xbps_write_metadata_pkg()
else else
spkgrev="${subpkg}-${version}" spkgrev="${subpkg}-${version}"
fi fi
unset run_depends conf_files noarch triggers replaces \
revision openrc_services essential keep_empty_dirs
check_installed_pkg ${spkgrev} check_installed_pkg ${spkgrev}
[ $? -eq 0 ] && continue [ $? -eq 0 ] && continue
if [ ! -f $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template ]; then if [ ! -f $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template ]; then
msg_error "Cannot find subpackage build template!" msg_error "Cannot find subpkg '${subpkg}' build template!"
fi fi
unset run_depends conf_files noarch triggers replaces \
revision openrc_services essential keep_empty_dirs
. $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template
pkgname=${subpkg} pkgname=${subpkg}
set_tmpl_common_vars set_tmpl_common_vars
xbps_write_metadata_pkg_real xbps_write_metadata_pkg_real
run_template ${sourcepkg} setup_tmpl ${sourcepkg}
done done
if [ "$build_style" = "meta-template" -a -z "${run_depends}" ]; then if [ "$build_style" = "meta-template" -a -z "${run_depends}" ]; then