From b520c6312ff0ffec864576b5218f1638fae1e18b Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Thu, 19 Mar 2015 15:25:53 +1000 Subject: repo-add: merge desc and depends files There is little point in these two files being separated as the whole sync db is parsed at once. Signed-off-by: Allan McRae --- scripts/repo-add.sh.in | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'scripts') diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index c7923ec6..3ece8d5e 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -418,18 +418,14 @@ db_write_entry() { format_entry "BUILDDATE" "$builddate" format_entry "PACKAGER" "$packager" format_entry "REPLACES" "${_replaces[@]}" - } >'desc' + format_entry "CONFLICTS" "${_conflicts[@]}" + format_entry "PROVIDES" "${_provides[@]}" - # 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[@]}" - } >'depends' + } >'desc' popd >/dev/null popd >/dev/null -- cgit v1.2.3-24-g4f1b