diff options
| author | Dan McGee <dan@archlinux.org> | 2008-02-06 02:31:23 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-02-06 02:31:23 +0100 |
| commit | eca30ed66accd7c1555eb94cbdea60051efcf7f3 (patch) | |
| tree | 3ec7f3387dea753bb68968c66597a1aa8e091ab4 /scripts | |
| parent | 93a3050ed9e9735352013014da52adcdf896f95f (diff) | |
| parent | b29838c8250125a22016c16180e941d059d55539 (diff) | |
| download | pacman-eca30ed66accd7c1555eb94cbdea60051efcf7f3.tar.gz pacman-eca30ed66accd7c1555eb94cbdea60051efcf7f3.tar.xz | |
Merge branch 'maint'
Conflicts:
contrib/gensync
contrib/updatesync
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/makepkg.sh.in | 3 | ||||
| -rw-r--r-- | scripts/repo-add.sh.in | 4 | ||||
| -rw-r--r-- | scripts/repo-remove.sh.in | 4 |
3 files changed, 8 insertions, 3 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...")" diff --git a/scripts/repo-remove.sh.in b/scripts/repo-remove.sh.in index 05bec390..fe230b02 100644 --- a/scripts/repo-remove.sh.in +++ b/scripts/repo-remove.sh.in @@ -25,7 +25,6 @@ export TEXTDOMAINDIR='@localedir@' myver='@PACKAGE_VERSION@' confdir='@sysconfdir@' -FORCE=0 REPO_DB_FILE="" msg() { @@ -169,6 +168,9 @@ if [ $success -eq 1 ]; then esac bsdtar -c${TAR_OPT}f "$REPO_DB_FILE" * + else + error "$(gettext "All packages have been removed from the database. Deleting '%s'.")" "$REPO_DB_FILE" + rm "$REPO_DB_FILE" fi popd 2>&1 >/dev/null |