diff options
| author | Allan McRae <allan@archlinux.org> | 2015-03-19 15:25:53 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2015-03-26 14:43:37 +1000 |
| commit | b520c6312ff0ffec864576b5218f1638fae1e18b (patch) | |
| tree | 972ccbcfe0f2603a979b7b4bde9f153012a70bcc | |
| parent | 2408d46c1b23da029c75e2937d71de53fa5e0338 (diff) | |
| download | pacman-b520c6312ff0ffec864576b5218f1638fae1e18b.tar.xz | |
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 <allan@archlinux.org>
| -rw-r--r-- | scripts/repo-add.sh.in | 10 |
1 files changed, 3 insertions, 7 deletions
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 |