[pacman-dev] [PATCH] repo-add: put conflicts/provides in desc file

[Allan McRae]

It does not make sense for these fields to be in the "depends" file.

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 scripts/repo-add.sh.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
index c7923ec..fb04b3f 100644
--- a/scripts/repo-add.sh.in
+++ b/scripts/repo-add.sh.in
@@ -418,14 +418,14 @@ db_write_entry() {
 		format_entry "BUILDDATE" "$builddate"
 		format_entry "PACKAGER"  "$packager"
 		format_entry "REPLACES"  "${_replaces[@]}"
+		format_entry "CONFLICTS" "${_conflicts[@]}"
+		format_entry "PROVIDES"  "${_provides[@]}"
 	} >'desc'
 
 	# create depends entry
 	msg2 "$(gettext "Creating '%s' db entry...")" 'depends'
 	{
 		format_entry "DEPENDS" "${_depends[@]}"
-		format_entry "CONFLICTS" "${_conflicts[@]}"
-		format_entry "PROVIDES" "${_provides[@]}"
 		format_entry "OPTDEPENDS" "${_optdepends[@]}"
 		format_entry "MAKEDEPENDS" "${_makedepends[@]}"
 		format_entry "CHECKDEPENDS" "${_checkdepends[@]}"
-- 
2.3.3