summaryrefslogtreecommitdiffstats
path: root/scripts/repo-add.sh.in
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-02-06 02:31:23 +0100
committerDan McGee <dan@archlinux.org>2008-02-06 02:31:23 +0100
commiteca30ed66accd7c1555eb94cbdea60051efcf7f3 (patch)
tree3ec7f3387dea753bb68968c66597a1aa8e091ab4 /scripts/repo-add.sh.in
parent93a3050ed9e9735352013014da52adcdf896f95f (diff)
parentb29838c8250125a22016c16180e941d059d55539 (diff)
downloadpacman-eca30ed66accd7c1555eb94cbdea60051efcf7f3.tar.gz
pacman-eca30ed66accd7c1555eb94cbdea60051efcf7f3.tar.xz
Merge branch 'maint'
Conflicts: contrib/gensync contrib/updatesync
Diffstat (limited to 'scripts/repo-add.sh.in')
-rw-r--r--scripts/repo-add.sh.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
index c37a12fa..efd3bc03 100644
--- a/scripts/repo-add.sh.in
+++ b/scripts/repo-add.sh.in
@@ -136,7 +136,7 @@ db_write_entry()
# blank out all variables and set pkgfile
local pkgfile=$(readlink -f "$1")
local pkgname pkgver pkgdesc url builddate packager csize size \
- group depend backup license replaces provides conflict \
+ group depend backup license replaces provides conflict force \
_groups _depends _backups _licenses _replaces _provides _conflicts \
startdir
@@ -209,7 +209,7 @@ 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"
- [ $FORCE -eq 1 ] && echo -e "%FORCE%\n" >>desc
+ [ $FORCE -eq 1 -o -n "$force" ] && echo -e "%FORCE%\n" >>desc
# create depends entry
msg2 "$(gettext "Creating 'depends' db entry...")"