From 69bc5ea5e28086c8eea6808be2be3c84b555863b Mon Sep 17 00:00:00 2001 From: Chantry Xavier Date: Sat, 2 Feb 2008 21:52:19 +0100 Subject: add 'force' to PKGINFO, have repo-add respect it. Ref: http://www.archlinux.org/pipermail/pacman-dev/2008-January/011023.html Also see FS#9347 and FS#9349. Signed-off-by: Chantry Xavier Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 3 +++ scripts/repo-add.sh.in | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0997386e..68ad5978 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -810,6 +810,9 @@ create_package() { if [ "$CARCH" != "" ]; then echo "arch = $CARCH" >>.PKGINFO fi + if [ "$(check_option force)" = "y" ]; then + echo "force = true" >> .PKGINFO + fi local it for it in "${license[@]}"; do 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...")" -- cgit v1.2.3-70-g09d2