moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove DB_COMPRESSION and DB_CHECKSUMS from makepkg.conf 

DB_COMPRESSION was only used in repo-add and DB_CHECKSUMS was not used
anywhere.
This also removes the dependency on makepkg.conf in repo-add, so repo-add no
longer needs to source makepkg.conf

And instead of DB_COMPRESSION, it seems better to just check the extension
of the repository file. It does not make sense to have a tar.gz file with a
tar.bz2 extension or whatever.

Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Xavier Chantry 2008-08-20 23:01:47 +02:00 committed by Dan McGee
parent 496b687c3d
commit 7e8f1469c4
3 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/makepkg.conf.5.txt
View File

@ -156,7 +156,7 @@ Options
This value is used when querying a package to see who was the builder. This value is used when querying a package to see who was the builder.
It is recommended you change this to your name and email address. It is recommended you change this to your name and email address.
*BUILDSCRIPT*, *PKGEXT*, *SRCEXT*, *DB_COMPRESSION*, *DB_CHECKSUMS*:: *BUILDSCRIPT*, *PKGEXT*, *SRCEXT*::
Do not touch these unless you know what you are doing. Do not touch these unless you know what you are doing.

2
etc/makepkg.conf.in
View File

@ -99,7 +99,5 @@ STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,
BUILDSCRIPT='PKGBUILD' BUILDSCRIPT='PKGBUILD'
PKGEXT='@PKGEXT@' PKGEXT='@PKGEXT@'
SRCEXT='@SRCEXT@' SRCEXT='@SRCEXT@'
DB_COMPRESSION='gz'
DB_CHECKSUMS=(md5)
# vim: set ft=sh ts=2 sw=2 et: # vim: set ft=sh ts=2 sw=2 et:

21
scripts/repo-add.sh.in
View File

@ -305,18 +305,6 @@ else
exit 1 # $E_MISSING_PROGRAM exit 1 # $E_MISSING_PROGRAM
fi fi
# source system and user makepkg.conf
if [ -r "$confdir/makepkg.conf" ]; then
source "$confdir/makepkg.conf"
else
error "$(gettext "%s not found. Cannot continue.")" "$confdir/makepkg.conf"
exit 1 # $E_CONFIG_ERROR
fi
if [ -r ~/.makepkg.conf ]; then
source ~/.makepkg.conf
fi
# main routine # main routine
gstmpdir=$(mktemp -d /tmp/repo-tools.XXXXXXXXXX) || (\ gstmpdir=$(mktemp -d /tmp/repo-tools.XXXXXXXXXX) || (\
error "$(gettext "Cannot create temp directory for database building.")"; \ error "$(gettext "Cannot create temp directory for database building.")"; \
@ -387,10 +375,11 @@ if [ $success -eq 1 ]; then
[ -f "${REPO_DB_FILE}.old" ] && rm "${REPO_DB_FILE}.old" [ -f "${REPO_DB_FILE}.old" ] && rm "${REPO_DB_FILE}.old"
[ -f "$REPO_DB_FILE" ] && mv "$REPO_DB_FILE" "${REPO_DB_FILE}.old" [ -f "$REPO_DB_FILE" ] && mv "$REPO_DB_FILE" "${REPO_DB_FILE}.old"
case "$DB_COMPRESSION" in case "$REPO_DB_FILE" in
gz) TAR_OPT="z" ;; *tar.gz) TAR_OPT="z" ;;
bz2) TAR_OPT="j" ;; *tar.bz2) TAR_OPT="j" ;;
*) warning "$(gettext "No compression set.")" ;; *) warning "$(gettext "'%s' does not have a valid archive extension.")" \
"$REPO_DB_FILE" ;;
esac esac
bsdtar -c${TAR_OPT}f "$REPO_DB_FILE" * bsdtar -c${TAR_OPT}f "$REPO_DB_FILE" *