[pacman-dev] [RFC] repo-add: merge desc and depends files

[Allan McRae]

There is little point in these two files being separated as the whole sync db
is parsed at once.

Signed-off-by: Allan McRae <allan at archlinux.org>
---

Reading sync dbs from the tarball was introduced in pacman-3.5 (2011-03-16).
That also introduced the combined handling of depends and desc files
(commit a44c7b8956).  So this change (and indeed the preceeding patch
moving REPLACES and CONFLICTS into desc) will result in pacman-3.4 being
unable to read databases created by repo-add-5.0.

Is this acceptable?


 scripts/repo-add.sh.in | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
index fb04b3f..3ece8d5 100644
--- a/scripts/repo-add.sh.in
+++ b/scripts/repo-add.sh.in
@@ -420,16 +420,12 @@ db_write_entry() {
 		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 "OPTDEPENDS" "${_optdepends[@]}"
 		format_entry "MAKEDEPENDS" "${_makedepends[@]}"
 		format_entry "CHECKDEPENDS" "${_checkdepends[@]}"
-	} >'depends'
+	} >'desc'
 
 	popd >/dev/null
 	popd >/dev/null
-- 
2.3.3