teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shutils: prepare for upcoming "$conflicts" support. 

--HG--
extra : convert_revision : 021b9ea71ef7dbd8bcdef844a9e1379613db88d3
This commit is contained in:
Juan RP 2010-03-08 10:52:55 +01:00
parent 73dab0587b
commit 2f5d1187a3
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -337,6 +337,16 @@ _EOF
echo "</array>" >> $TMPFPROPS
fi
# Conflicting package(s).
if [ -n "$conflicts" ]; then
echo "<key>conflicts</key>" >> $TMPFPROPS
echo "<array>" >> $TMPFPROPS
for f in ${conflicts}; do
echo "<string>$(echo $f|sed "s|<|\&lt;|g;s|>|\&gt;|g")</string>" >> $TMPFPROPS
done
echo "</array>" >> $TMPFPROPS
fi
# Terminate the property list file.
echo "</dict>" >> $TMPFPROPS
echo "</plist>" >> $TMPFPROPS

2
xbps-src/shutils/tmpl_funcs.sh
View File

@ -76,7 +76,7 @@ reset_tmpl_vars()
noarch subpackages sourcepkg gtk_iconcache_dirs \
abi_depends api_depends triggers openrc_services \
replaces system_accounts build_wrksrc create_wrksrc \
ignore_vdeps_dir noverifyrdeps \
ignore_vdeps_dir noverifyrdeps conflicts \
XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \
XBPS_BUILD_DONE XBPS_INSTALL_DONE FILESDIR DESTDIR \
SRCPKGDESTDIR PATCHESDIR"