[arch-dev-public] [devtools] [PATCH] read {SRC, PKG}DEST from user makepkg.conf
makechrootpkg does not read SRCDEST and PKGDEST if they are set in ~/.makepkg.conf -- Andrea `bash` Scarpino Arch Linux Developer
On Friday 26 February 2010 16:23:37 you wrote:
makechrootpkg does not read SRCDEST and PKGDEST if they are set in ~/.makepkg.conf sorry, this fix the typo
Also, this read PKGEXT from makepkg.conf, we use $PKGEXT at line 208, but who set it? -- Andrea `bash` Scarpino Arch Linux Developer
Am 26.02.2010 16:33, schrieb Andrea Scarpino:
On Friday 26 February 2010 16:23:37 you wrote:
makechrootpkg does not read SRCDEST and PKGDEST if they are set in ~/.makepkg.conf sorry, this fix the typo
Also, this read PKGEXT from makepkg.conf, we use $PKGEXT at line 208, but who set it?
Your logic is reversed: Settings from ~ should override the ones from /etc. Your logic now sets the one from /etc and only if that is not set/empty takes the one from ~, thus /etc overrides ~.
On Friday 26 February 2010 16:53:13 Thomas Bächler wrote:
Your logic is reversed: Settings from ~ should override the ones from /etc. Your logic now sets the one from /etc and only if that is not set/empty takes the one from ~, thus /etc overrides ~. You are right, I assumed that if settings are not set, then read from makepkg.conf.
-- Andrea `bash` Scarpino Arch Linux Developer
On Friday 26 February 2010 16:56:59 Andrea Scarpino wrote:
You are right, I assumed that if settings are not set, then read from makepkg.conf. Why we do not source the whole /etc/makepkg.conf, then ~/.makepkg.conf?
-- Andrea `bash` Scarpino Arch Linux Developer
On Fri, Feb 26, 2010 at 9:12 AM, Andrea Scarpino <andrea@archlinux.org> wrote:
On Friday 26 February 2010 16:56:59 Andrea Scarpino wrote:
You are right, I assumed that if settings are not set, then read from makepkg.conf. Why we do not source the whole /etc/makepkg.conf, then ~/.makepkg.conf?
There was a reason for it. Check the git log, it should be in the patch notes somewhere, I just can't recall it. I believe it had to do with the fact that we have potentially different makepkg.conf files in the chroot and outside of it
I thought someone else has fixed this. New patch. -- Andrea Scarpino - andreascarpino.it KDE Maintainer in Arch Linux
On Wed, 2010-05-05 at 13:06 +0200, Andrea Scarpino wrote:
+[ -f ~/.makepkg.conf ] && SRCDEST=$(grep '^SRCDEST=' ~/.makepkg.conf | cut -d= -f2)
So what if I have a ~/.makepkg.conf without SRCDEST set?
Everytime that I build KDE in a new system I fall into this. Should be ok now. From 0120495d9ff6729ca20bd9a0fef56f709738aa79 Mon Sep 17 00:00:00 2001 From: Andrea Scarpino <andrea@archlinux.org> Date: Fri, 25 Jun 2010 15:04:13 +0200 Subject: [PATCH] read SRC/PKGDEST from ~/.makepkg.conf too --- makechrootpkg | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/makechrootpkg b/makechrootpkg index 779786e..5a77462 100755 --- a/makechrootpkg +++ b/makechrootpkg @@ -134,8 +134,10 @@ if [ "$REPACK" != "1" ]; then fi # Get SRC/PKGDEST from makepkg.conf -SRCDEST=$(grep '^SRCDEST=' /etc/makepkg.conf | cut -d= -f2) -PKGDEST=$(grep '^PKGDEST=' /etc/makepkg.conf | cut -d= -f2) +SRCDEST=$(grep '^SRCDEST=' ~/.makepkg.conf | cut -d= -f2) +[ -z ${SRCDEST} ] && SRCDEST=$(grep '^SRCDEST=' /etc/makepkg.conf | cut -d= - f2) +PKGDEST=$(grep '^PKGDEST=' ~/.makepkg.conf | cut -d= -f2) +[ -z ${PKGDEST} ] && PKGDEST=$(grep '^PKGDEST=' /etc/makepkg.conf | cut -d= - f2) [ -d "$copydir/pkgdest" ] || mkdir "$copydir/pkgdest" if ! grep 'PKGDEST=/pkgdest' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then -- 1.7.1 -- Andrea Scarpino - andreascarpino.it KDE Maintainer in Arch Linux
On Fri, 25 Jun 2010 15:09:42 +0200, Andrea Scarpino <andrea@archlinux.org> wrote:
Everytime that I build KDE in a new system I fall into this.
Should be ok now.
From 0120495d9ff6729ca20bd9a0fef56f709738aa79 Mon Sep 17 00:00:00 2001 From: Andrea Scarpino <andrea@archlinux.org> Date: Fri, 25 Jun 2010 15:04:13 +0200 Subject: [PATCH] read SRC/PKGDEST from ~/.makepkg.conf too
--- makechrootpkg | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/makechrootpkg b/makechrootpkg index 779786e..5a77462 100755 --- a/makechrootpkg +++ b/makechrootpkg @@ -134,8 +134,10 @@ if [ "$REPACK" != "1" ]; then fi
# Get SRC/PKGDEST from makepkg.conf -SRCDEST=$(grep '^SRCDEST=' /etc/makepkg.conf | cut -d= -f2) -PKGDEST=$(grep '^PKGDEST=' /etc/makepkg.conf | cut -d= -f2) +SRCDEST=$(grep '^SRCDEST=' ~/.makepkg.conf | cut -d= -f2) +[ -z ${SRCDEST} ] && SRCDEST=$(grep '^SRCDEST=' /etc/makepkg.conf | cut -d= - f2) +PKGDEST=$(grep '^PKGDEST=' ~/.makepkg.conf | cut -d= -f2) +[ -z ${PKGDEST} ] && PKGDEST=$(grep '^PKGDEST=' /etc/makepkg.conf | cut -d= - f2)
[ -d "$copydir/pkgdest" ] || mkdir "$copydir/pkgdest" if ! grep 'PKGDEST=/pkgdest' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then -- 1.7.1
Could you resent this patch? It seems broken. In doubt just send as an attachement and not inline. -- Pierre Schmitz, https://users.archlinux.de/~pierre
On Monday 28 June 2010 08:16:06 Pierre Schmitz wrote:
Could you resent this patch? It seems broken. In doubt just send as an attachement and not inline.
-- Andrea Scarpino - andreascarpino.it KDE Maintainer in Arch Linux
On Mon, 28 Jun 2010 08:50:28 +0200, Andrea Scarpino <andrea@archlinux.org> wrote:
On Monday 28 June 2010 08:16:06 Pierre Schmitz wrote:
Could you resent this patch? It seems broken. In doubt just send as an attachement and not inline.
applied. I'll package a new devtools release soon. -- Pierre Schmitz, https://users.archlinux.de/~pierre
participants (5)
-
Aaron Griffin
-
Andrea Scarpino
-
Jan de Groot
-
Pierre Schmitz
-
Thomas Bächler