Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=69cc661780753e2469f131452dfc1441e6d463d3
commit 69cc661780753e2469f131452dfc1441e6d463d3
Author: Marcus Habermehl <[EMAIL PROTECTED]>
Date: Wed Dec 26 17:52:32 2007 +0100
Changing the cache directory
from /var/cache/pacman to /var/cache/pacman-g2.
NOTE: backward compat symlink in upgrade scriptlet needed
diff --git a/README b/README
index 5c251f9..d3fc3de 100644
--- a/README
+++ b/README
@@ -301,7 +301,7 @@ The library is providing download facilities. As a
consequence, it is no longer
up the the frontend to retrieve packages from FTP servers. To do so, libpacman
is linked against an improved version of libftp supporting both http and ftp
donwloads. As a consequence, the library is repsonsible for the directory
-/var/cache/pacman/pkgs. One can consider that this cache is a facility
+/var/cache/pacman-g2/pkgs. One can consider that this cache is a facility
provided by the library.
Note: other frontends have to download packages by themselves too,
diff --git a/TODO b/TODO
index 210b978..bd34c14 100644
--- a/TODO
+++ b/TODO
@@ -26,7 +26,6 @@ G2 TODO
- Review #1079 (BTS) and maybe implement it
- untouched dirs from pacman:
- pamcan.conf, pacman.d
- - /var/cache/pacman
- Review stuffs which gives warnings when using --enable-strict and fix those.
diff --git a/doc/FrugalBuild.txt b/doc/FrugalBuild.txt
index caf8b02..ff7c8f9 100644
--- a/doc/FrugalBuild.txt
+++ b/doc/FrugalBuild.txt
@@ -228,7 +228,7 @@ source (array)::
The source line is an array of source files required to build the package.
Source files must reside in the same directory as the FrugalBuild file, unless
they have a fully-qualified URL. Then if the source file does not already exist
- in `/var/cache/pacman/src`, the file is downloaded by wget.
+ in `/var/cache/pacman-g2/src`, the file is downloaded by wget.
sha1sums (array)::
If this field is present, it should contain an SHA1 hash for every source file
diff --git a/doc/pacman-g2.txt b/doc/pacman-g2.txt
index 419e9e2..3a690eb 100644
--- a/doc/pacman-g2.txt
+++ b/doc/pacman-g2.txt
@@ -125,7 +125,7 @@ pacman-g2 packages are in a bzipped tar format.
-c, --clean::
Remove old packages from the cache. When pacman-g2 downloads packages, it saves
- them in /var/cache/pacman/pkg. If you need to free up diskspace, you
can remove
+ them in /var/cache/pacman-g2/pkg. If you need to free up diskspace, you
can remove
these packages by using the --clean option. Using one --clean (or -c) switch
will only remove old packages. Use it twice to remove all packages from the
cache.
@@ -315,7 +315,7 @@ DBPath = path/to/db/dir::
CacheDir = path/to/cache/dir::
Overrides the default location of the package cache directory. The default is
- var/cache/pacman.
+ var/cache/pacman-g2.
HoldPkg = <package> [package] ...::
If a user tries to --remove a package that's listed in HoldPkg, pacman-g2 will
diff --git a/lib/libpacman/pacman.h b/lib/libpacman/pacman.h
index a8e922d..cfb196f 100644
--- a/lib/libpacman/pacman.h
+++ b/lib/libpacman/pacman.h
@@ -34,7 +34,7 @@ extern "C" {
#define PM_ROOT "/"
#define PM_DBPATH "var/lib/pacman-g2"
-#define PM_CACHEDIR "var/cache/pacman/pkg"
+#define PM_CACHEDIR "var/cache/pacman-g2/pkg"
#define PM_LOCK "/tmp/pacman-g2.lck"
#define PM_HOOKSDIR "etc/pacman-g2/hooks"
diff --git a/pactest/util.py b/pactest/util.py
index 5c7b0bb..74e1e41 100644
--- a/pactest/util.py
+++ b/pactest/util.py
@@ -27,7 +27,7 @@ import stat
# libpacman
PM_ROOT = "/"
PM_DBPATH = "var/lib/pacman-g2"
-PM_CACHEDIR = "var/cache/pacman/pkg"
+PM_CACHEDIR = "var/cache/pacman-g2/pkg"
PM_LOCK = "/tmp/pacman-g2.lck"
PM_EXT_PKG = ".fpm"
PM_EXT_DB = ".fdb"
diff --git a/scripts/makepkg b/scripts/makepkg
index 023adaa..975d14d 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -353,7 +353,7 @@ chroot_umount() {
umount $CHROOTDIR/proc >/dev/null
umount $CHROOTDIR/sys >/dev/null
umount $CHROOTDIR/dev >/dev/null
- umount $CHROOTDIR/var/cache/pacman >/dev/null
+ umount $CHROOTDIR/var/cache/pacman-g2 >/dev/null
umount $CHROOTDIR/var/cache/ccache/$pkgname >/dev/null
if [ "$?" != "0" ]; then
error "An error occurred while attempting to umount chroot directories."
@@ -367,7 +367,7 @@ chroot_mount() {
mount -t proc none $CHROOTDIR/proc >/dev/null &
mount -t sysfs none $CHROOTDIR/sys >/dev/null &
mount -o bind /dev $CHROOTDIR/dev >/dev/null &
- mount -o bind /var/cache/pacman $CHROOTDIR/var/cache/pacman >/dev/null &
+ mount -o bind /var/cache/pacman-g2 $CHROOTDIR/var/cache/pacman-g2
>/dev/null &
mount -o bind /var/cache/ccache/$pkgname \
$CHROOTDIR/var/cache/ccache/$pkgname >/dev/null &
if [ "$?" != "0" ]; then
@@ -744,7 +744,7 @@ if [ $CLEANCACHE -ge 1 ]; then
if [ "`id -u`" = "0" -a "$INFAKEROOT" != "1" ]; then
if [ $CLEANCACHE -ge 2 ]; then
msg "Cleaning up source files from the cache."
- rm -rf /var/cache/pacman/src/*
+ rm -rf /var/cache/pacman-g2/src/*
fi
chroot_clean
for i in `grep $CHROOTDIR /proc/mounts|sed 's/^[^ ]* \([^ ]*\) .*/\1/'`
@@ -969,7 +969,7 @@ if [ "$CHROOT" = "1" -a "$INCHROOT" != "1" ]; then
fi
CHROOTDIR="$CHROOTDIR/$TREE"
- mkdir -p $CHROOTDIR/{dev,etc,proc,sys,var/cache/pacman,var/tmp/fst}
+ mkdir -p $CHROOTDIR/{dev,etc,proc,sys,var/cache/pacman-g2,var/tmp/fst}
chroot_lock
@@ -1227,9 +1227,9 @@ for netfile in "[EMAIL PROTECTED]" "[EMAIL PROTECTED]"; do
if [ -f "../$file" ]; then
msg2 "Found $file in build dir"
cp "../$file" .
- elif [ -f "/var/cache/pacman/src/$file" ]; then
+ elif [ -f "/var/cache/pacman-g2/src/$file" ]; then
msg2 "Using local copy of $file"
- cp "/var/cache/pacman/src/$file" .
+ cp "/var/cache/pacman-g2/src/$file" .
else
proto=`echo "$netfile" | sed 's|://.*||'`
if [ "$proto" != "ftp" -a "$proto" != "http" -a "$proto" != "https" ]; then
@@ -1261,7 +1261,7 @@ for netfile in "[EMAIL PROTECTED]" "[EMAIL PROTECTED]"; do
fi
fi
if [ "`id -u`" = "0" -a "$INFAKEROOT" != "1" ]; then
- mkdir -p /var/cache/pacman/src && cp "$file"
/var/cache/pacman/src
+ mkdir -p /var/cache/pacman-g2/src && cp "$file"
/var/cache/pacman-g2/src
else
cp "$file" ..
fi
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
