summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPyroPeter <abi1789@googlemail.com>2011-01-11 23:04:20 +0100
committerDan McGee <dan@archlinux.org>2011-01-11 20:30:27 -0600
commiteda4d9ec00be1108ab4336a438299a283c5a0a90 (patch)
treef73f228a686b35c8c65da498a8e40c6929885a07
parent7ce90bb135c04b4421ca2824099e6e72659721b1 (diff)
downloadpacman-eda4d9ec00be1108ab4336a438299a283c5a0a90.tar.xz
repo-add: Create/modify files databases
Implements FS#11302. Dan: updated docs to not reference pkgfile. Signed-off-by: PyroPeter <abi1789@googlemail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--doc/repo-add.8.txt8
-rw-r--r--scripts/repo-add.sh.in18
2 files changed, 21 insertions, 5 deletions
diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt
index 81bf8377..2500ab8b 100644
--- a/doc/repo-add.8.txt
+++ b/doc/repo-add.8.txt
@@ -10,7 +10,7 @@ repo-add - package database maintenance utility
Synopsis
--------
-repo-add [-q] <path-to-db> <package1> [<package2> ...]
+repo-add [-f] [-q] <path-to-db> <package1> [<package2> ...]
repo-remove [-q] <path-to-db> <packagename> [<packagename2> ...]
@@ -30,11 +30,15 @@ on the command line.
Options
-------
+*-f, \--files*::
+ Tells repo-add also to create and include a list of the files in the
+ specified packages. This is useful for creating databases listing all files
+ in a given sync repository for tools that may use this information.
+
*-q, \--quiet*::
Force this program to keep quiet and run silent except for warning and
error messages.
-
See Also
--------
linkman:makepkg[8], linkman:pacman[8]
diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
index 1933950d..65a63d85 100644
--- a/scripts/repo-add.sh.in
+++ b/scripts/repo-add.sh.in
@@ -29,6 +29,7 @@ confdir='@sysconfdir@'
QUIET=0
DELTA=0
+WITHFILES=0
REPO_DB_FILE=
LOCKFILE=
CLEAN_LOCK=0
@@ -61,7 +62,7 @@ error() {
# print usage instructions
usage() {
printf "repo-add, repo-remove (pacman) %s\n\n" "$myver"
- printf "$(gettext "Usage: repo-add [-d] [-q] <path-to-db> <package|delta> ...\n")"
+ printf "$(gettext "Usage: repo-add [-d] [-f] [-q] <path-to-db> <package|delta> ...\n")"
printf "$(gettext "Usage: repo-remove [-q] <path-to-db> <packagename|delta> ...\n\n")"
printf "$(gettext "\
repo-add will update a package database by reading a package file.\n\
@@ -77,6 +78,8 @@ and errors.\n\n")"
Use the -d/--delta flag to automatically generate and add a delta file\n\
between the old entry and the new one, if the old package file is found\n\
next to the new one.\n\n")"
+ printf "$(gettext "\
+Use the -f/--files flag to update a database including file entries.\n\n")"
echo "$(gettext "Example: repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz")"
echo "$(gettext "Example: repo-remove /path/to/repo.db.tar.gz kernel26")"
}
@@ -290,14 +293,22 @@ db_write_entry()
popd >/dev/null
popd >/dev/null
+ # create files file if wanted
+ if (( WITHFILES )); then
+ msg2 "$(gettext "Creating 'files' db entry...")"
+ local files_path="$tmpdir/$pkgname-$pkgver/files"
+ echo "%FILES%" >$files_path
+ bsdtar --exclude='.*' -tf "$pkgfile" >>$files_path
+ fi
+
# create a delta file
if [ -n "$oldfilename" -a -f "$oldfile" ]; then
delta=$(pkgdelta -q $oldfile $1)
if [ -f "$delta" ]; then
db_write_delta $delta
- else
- warning "$(gettext "Old package file not found : %s")" "$oldfilename"
fi
+ else
+ warning "$(gettext "Old package file not found : %s")" "$oldfilename"
fi
return 0
@@ -472,6 +483,7 @@ for arg in "$@"; do
case "$arg" in
-q|--quiet) QUIET=1;;
-d|--delta) DELTA=1;;
+ -f|--files) WITHFILES=1;;
*)
if [[ -z $REPO_DB_FILE ]]; then
REPO_DB_FILE="$arg"