summaryrefslogtreecommitdiffstats
path: root/scripts/repo-add.sh.in
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-01-10 20:40:31 +0100
committerDan McGee <dan@archlinux.org>2011-01-22 02:30:45 +0100
commitbf46e04614b3740eea4a5e0d44767f57e1cffa4d (patch)
tree4a1fb5d578a539e42a1d73de1b3d83edbf17a58a /scripts/repo-add.sh.in
parent5c46ba14f780474e2b04b54aa7b0c8bf60de2b5b (diff)
downloadpacman-bf46e04614b3740eea4a5e0d44767f57e1cffa4d.tar.gz
pacman-bf46e04614b3740eea4a5e0d44767f57e1cffa4d.tar.xz
Remove epoch as an independent field
Instead, go the same route we have always taken with version-release in libalpm and treat it all as one piece of information. Makepkg is the only script that knows about epoch as a distinct value; from there on out we will parse out the components as necessary. This makes the code a lot simpler as far as epoch handling goes. The downside here is that we are tossing some compatibility to the wind; packages using force will have to be rebuilt with an incremented epoch to keep their special status. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'scripts/repo-add.sh.in')
-rw-r--r--scripts/repo-add.sh.in8
1 files changed, 1 insertions, 7 deletions
diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
index 87c7834f..2929c967 100644
--- a/scripts/repo-add.sh.in
+++ b/scripts/repo-add.sh.in
@@ -190,7 +190,7 @@ db_write_entry()
{
# blank out all variables
local pkgfile="$1"
- local pkgname pkgver pkgdesc epoch csize size md5sum url arch builddate packager force \
+ local pkgname pkgver pkgdesc csize size md5sum url arch builddate packager \
_groups _licenses _replaces _depends _conflicts _provides _optdepends
local OLDIFS="$IFS"
@@ -274,12 +274,6 @@ db_write_entry()
[[ -n $builddate ]] && echo -e "%BUILDDATE%\n$builddate\n" >>desc
[[ -n $packager ]] && echo -e "%PACKAGER%\n$packager\n" >>desc
write_list_entry "REPLACES" "$_replaces" "desc"
- # remain backward-compatible for now; put a force entry in the database
- if [[ -n $epoch ]]; then
- echo -e "%EPOCH%\n#epoch\n" >>desc
- echo -e "%FORCE%\n" >>desc
- fi
- [[ -n $force ]] && echo -e "%FORCE%\n" >>desc
# create depends entry
msg2 "$(gettext "Creating 'depends' db entry...")"