diff --git a/xbps-src/shutils/metadata.sh b/xbps-src/shutils/metadata.sh index e66044af6c5..afb08cccc03 100644 --- a/xbps-src/shutils/metadata.sh +++ b/xbps-src/shutils/metadata.sh @@ -337,6 +337,16 @@ _EOF echo "" >> $TMPFPROPS fi + # Conflicting package(s). + if [ -n "$conflicts" ]; then + echo "conflicts" >> $TMPFPROPS + echo "" >> $TMPFPROPS + for f in ${conflicts}; do + echo "$(echo $f|sed "s|<|\<|g;s|>|\>|g")" >> $TMPFPROPS + done + echo "" >> $TMPFPROPS + fi + # Terminate the property list file. echo "" >> $TMPFPROPS echo "" >> $TMPFPROPS diff --git a/xbps-src/shutils/tmpl_funcs.sh b/xbps-src/shutils/tmpl_funcs.sh index 96a49d8c6c0..d5ddaafbe1a 100644 --- a/xbps-src/shutils/tmpl_funcs.sh +++ b/xbps-src/shutils/tmpl_funcs.sh @@ -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"