diff options
| author | Chantry Xavier <shiningxc@gmail.com> | 2008-02-02 21:52:19 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-02-02 18:55:40 -0600 |
| commit | 69bc5ea5e28086c8eea6808be2be3c84b555863b (patch) | |
| tree | 023093f0c43cf93955dbf93504ac5b172eccd945 | |
| parent | 96ee1bca2473ea32d647db0464653424e34b1e91 (diff) | |
| download | pacman-69bc5ea5e28086c8eea6808be2be3c84b555863b.tar.xz | |
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 <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 3 | ||||
| -rw-r--r-- | scripts/repo-add.sh.in | 4 |
2 files changed, 5 insertions, 2 deletions
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...")" |