Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=528d2b10d45614264c1d46e7f5263c4fa0ce668e
commit 528d2b10d45614264c1d46e7f5263c4fa0ce668e
Author: Marcus Habermehl <[EMAIL PROTECTED]>
Date: Wed Dec 26 17:58:01 2007 +0100
Changing the configuration file
from /etc/pacman.conf to /etc/pacman-g2.conf.
NOTE: compat symlink is needed in upgrade scriptlet
diff --git a/README b/README
index d3fc3de..8fa102e 100644
--- a/README
+++ b/README
@@ -26,7 +26,7 @@ wrappers) to this great package management tool.
Some features that pacman-g2 has over pacman: (September 2007)
1) It provides C#, Java, Perl and Python bindings for libpacman.
-2) libpacman provides a configuration file parser (for pacman.conf).
+2) libpacman provides a configuration file parser (for pacman-g2.conf).
3) It provides support for subpackages, ie. creating more than one binary
package using a single build script.
4) Localized manpages.
@@ -279,7 +279,7 @@ remove.c and sync.c).
[CONFIGURATION] (see conf.c)
-The frontend is using a configuration file, usually "/etc/pacman.conf".
+The frontend is using a configuration file, usually "/etc/pacman-g2.conf".
Part of these options are only usefull for the frontend only (mainly,
the download stuffs, and some options like HOLDPKG).
The rest is used to configure the library.
diff --git a/TODO b/TODO
index bd34c14..a9ca180 100644
--- a/TODO
+++ b/TODO
@@ -25,7 +25,7 @@ G2 TODO
- Review #1079 (BTS) and maybe implement it
- untouched dirs from pacman:
- - pamcan.conf, pacman.d
+ - pacman.d
- Review stuffs which gives warnings when using --enable-strict and fix those.
diff --git a/configure.ac b/configure.ac
index 1b80db3..aa9234c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,15 +32,15 @@ AC_SUBST(PM_MICRO_VERSION)
AC_SUBST(PM_VERSION)
AC_SUBST(PM_VERSION_INFO)
-dnl Define the default config file path for pacman.conf
-PACCONF=/etc/pacman.conf
-AC_DEFINE_UNQUOTED([PACCONF], ["$PACCONF"], [pacman.conf location])
+dnl Define the default config file path for pacman-g2.conf
+PACCONF=/etc/pacman-g2.conf
+AC_DEFINE_UNQUOTED([PACCONF], ["$PACCONF"], [pacman-g2.conf location])
dnl Put out version numbers to config.h
AC_DEFINE_UNQUOTED([PM_VERSION], ["$PM_VERSION"], [libpacman version number])
dnl Configuration files
-AC_CONFIG_FILES([etc/makepkg.conf] [etc/pacman.conf])
+AC_CONFIG_FILES([etc/makepkg.conf] [etc/pacman-g2.conf])
AC_PROG_CC
AC_HEADER_STDC
@@ -453,7 +453,7 @@ pacman-g2-$VERSION:
compiler flags : ${CFLAGS}
libpacman version : ${PM_VERSION}
- pacman.conf location : ${PACCONF}
+ pacman-g2.conf location : ${PACCONF}
Architecture CARCH : ${CARCH}
Architecture used cflag : ${CARCHFLAGS}
diff --git a/doc/pacman-g2.txt b/doc/pacman-g2.txt
index 3a690eb..acf4908 100644
--- a/doc/pacman-g2.txt
+++ b/doc/pacman-g2.txt
@@ -170,13 +170,13 @@ pacman-g2 packages are in a bzipped tar format.
-y, --refresh::
Download a fresh copy of the master package list from the ftp server defined in
- /etc/pacman.conf. This should typically be used each time you use
+ /etc/pacman-g2.conf. This should typically be used each time you use
--sysupgrade.
--ignore <pkg>::
This option functions exactly the same as the IgnorePkg configuration
directive. Sometimes it can be handy to skip some package updates without
- having to edit pacman.conf each time.
+ having to edit pacman-g2.conf each time.
== REMOVE OPTIONS
@@ -288,7 +288,7 @@ original=X, current=Y, new=Z::
== CONFIGURATION
-pacman-g2 will attempt to read /etc/pacman.conf each time it is invoked. This
+pacman-g2 will attempt to read /etc/pacman-g2.conf each time it is invoked.
This
configuration file is divided into sections or repositories. Each section
defines a package repository that pacman-g2 can use when searching for packages
in --sync mode. The exception to this is the options section, which defines
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 668b725..92550e4 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,3 +1,3 @@
SUBDIRS = pacman.d pacman-g2
-EXTRA_DIST = makepkg.conf pacman.conf
-dist_sysconf_DATA = makepkg.conf pacman.conf
+EXTRA_DIST = makepkg.conf pacman-g2.conf
+dist_sysconf_DATA = makepkg.conf pacman-g2.conf
diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in
deleted file mode 100644
index d8e9374..0000000
--- a/etc/pacman.conf.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# /etc/pacman.conf
-#
-
-# See the pacman-g2 manpage for option directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-LogFile = /var/log/pacman-g2.log
-HoldPkg = pacman-g2 glibc bash coreutils chkconfig
-# Issue a warning before install when you haven't done a -Sy for X days
-OldDelay = 3
-# Use this if you need advanced features. YOUR_OTPS can be for example
--limit-rate 800K
-#XferCommand = echo %o |sed -r 's/.(fpm|fdb).part$//'; curl -C -
--progress-bar -o %o %u YOUR_OTPS; echo
-
-# If you use the -current tree, you should disable the -stable
-# tree to avoid conflicts
-
-# -current
-Include = /etc/pacman.d/frugalware-current
-
-# -stable
-#Include = /etc/pacman.d/frugalware
-
-# An example of a custom package repository. See the pacman-g2 manpage for
-# tips on creating your own repositories.
-#[custom]
-#Server = file:///home/custompkgs
-
diff --git a/pactest/README b/pactest/README
index 045065a..06fc15d 100644
--- a/pactest/README
+++ b/pactest/README
@@ -18,7 +18,7 @@ pactest creates the environment in the subdirectory "root"
created in the
current directory.
The following directory structure is used:
- var/lib/pacman-g2: databases path (local and sync ones)
- - etc/pacman.conf for pacman-g2 configuration file
+ - etc/pacman-g2.conf for pacman-g2 configuration file
- var/cache/pkg: sync packages cache
- var/log/pactest.log: log file
- var/pub: location for pseudo sync repositories
@@ -105,7 +105,7 @@ It has 3 keys, each one of them pointing at a list of
strings:
Examples:
self.option["noupgrade"] = ["etc/X11/xorg.conf",
- "etc/pacman.conf"]
+ "etc/pacman-g2.conf"]
self.option["noextract"] = ["etc/lilo.conf"]
filesystem
diff --git a/pactest/util.py b/pactest/util.py
index 74e1e41..9a9f3ff 100644
--- a/pactest/util.py
+++ b/pactest/util.py
@@ -36,7 +36,7 @@ PM_PACORIG = ".pacorig"
PM_PACSAVE = ".pacsave"
# Pacman
-PACCONF = "etc/pacman.conf"
+PACCONF = "etc/pacman-g2.conf"
# Pactest
TMPDIR = "tmp"
diff --git a/scripts/gensync b/scripts/gensync
index c63051c..d175602 100755
--- a/scripts/gensync
+++ b/scripts/gensync
@@ -41,9 +41,9 @@ usage() {
echo
echo "note: The <destfile> name is important. It must be of the form"
echo " {treename}.$DB_EXT where {treename} is the name of the custom"
- echo " package repository you configured in /etc/pacman.conf. The"
+ echo " package repository you configured in /etc/pacman-g2.conf.
The"
echo " generated database must reside in the same directory as your"
- echo " custom packages (also configured in /etc/pacman.conf)"
+ echo " custom packages (also configured in /etc/pacman-g2.conf)"
echo
echo "example: gensync /var/fst/local /home/mypkgs/custom.$DB_EXT"
echo
diff --git a/scripts/makepkg b/scripts/makepkg
index 975d14d..28cf8a8 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -787,7 +787,7 @@ if [ ! -z "$DOWNLOAD" -a "$INFAKEROOT" != "1" ]; then
exit 1
fi
- confs=`cat /etc/pacman.conf |grep ^Include|sed 's/.* = \(.*\)/\1/'`
+ confs=`cat /etc/pacman-g2.conf |grep ^Include|sed 's/.* = \(.*\)/\1/'`
# searching for a mirror
repo=`pacman-g2 -Si $DOWNLOAD |grep ^Repo |sed -n 's/.* \([^ ]*\)/\1/;1 p'`
@@ -977,10 +977,10 @@ if [ "$CHROOT" = "1" -a "$INCHROOT" != "1" ]; then
chroot_mount
- if [ ! -d "$CHROOTDIR/usr" -o ! -e "$CHROOTDIR/etc/pacman.conf" ]; then
+ if [ ! -d "$CHROOTDIR/usr" -o ! -e "$CHROOTDIR/etc/pacman-g2.conf" ];
then
msg "Building a '-$TREE' chroot environment"
_F_makepkg_pacconf=`mktemp`
- cat /etc/pacman.conf |grep -v Include >$_F_makepkg_pacconf
+ cat /etc/pacman-g2.conf |grep -v Include >$_F_makepkg_pacconf
for i in `echo $TREE|sed 's/,/ /g'`
do
repo=$(eval "echo \${${i}_$DB_EXT/.$DB_EXT}")
@@ -995,7 +995,7 @@ if [ "$CHROOT" = "1" -a "$INCHROOT" != "1" ]; then
chroot_unlock
exit 1
fi
- mv -f $_F_makepkg_pacconf $CHROOTDIR/etc/pacman.conf
+ mv -f $_F_makepkg_pacconf $CHROOTDIR/etc/pacman-g2.conf
else
msg "Updating the chroot environment"
# copy these before any update since without them we can't even reach the
servers
diff --git a/src/pacman-g2/pacman-g2.c b/src/pacman-g2/pacman-g2.c
index ca1ccd1..b8a6f37 100644
--- a/src/pacman-g2/pacman-g2.c
+++ b/src/pacman-g2/pacman-g2.c
@@ -56,7 +56,7 @@
#include "sync.h"
#include "deptest.h"
-#define PACCONF "/etc/pacman.conf"
+#define PACCONF "/etc/pacman-g2.conf"
#if defined(__OpenBSD__) || defined(__APPLE__)
#define BSD
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
