[pacman-dev] [PATCH] makepkg: make SRCPKGDEST default to $startdir
The current behaviour, which is placing source packages in PKGDEST if SRCPKGDEST is not set, is inconsistent with {SRC,PKG}DEST handling and there is no real advantage in doing so. --- doc/makepkg.conf.5.txt | 4 ++-- scripts/makepkg.sh.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 020804c..6130249 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -183,8 +183,8 @@ Options **SRCPKGDEST=**"/path/to/folder":: If this value is not set, source package files will be stored in - PKGDEST. Many people like to keep all source package files in - a central location for easy cleanup, so this path can be set here. + in the current directory. Many people like to keep all source package files + in a central location for easy cleanup, so this path can be set here. **PACKAGER=**"John Doe <john@example.com>":: This value is used when querying a package to see who was the builder. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0a90b89..493c962 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1744,7 +1744,7 @@ if [[ ! -w $SRCDEST ]] ; then fi SRCPKGDEST=${_SRCPKGDEST:-$SRCPKGDEST} -SRCPKGDEST=${SRCPKGDEST:-$PKGDEST} #default to $PKGDEST if undefined +SRCPKGDEST=${SRCPKGDEST:-$startdir} #default to $startdir if undefined if (( HOLDVER )) && [[ -n $FORCE_VER ]]; then -- 1.7.4
On Tue, Feb 1, 2011 at 8:59 AM, Cedric Staniewski <cedric@gmx.ca> wrote:
The current behaviour, which is placing source packages in PKGDEST if SRCPKGDEST is not set, is inconsistent with {SRC,PKG}DEST handling and there is no real advantage in doing so. Other than preserving backward compatibility and the way it has worked for 2-3 years...
I don't have a super strong opinion, but to pretend like this isn't on purpose is not true at all.
--- doc/makepkg.conf.5.txt | 4 ++-- scripts/makepkg.sh.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 020804c..6130249 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -183,8 +183,8 @@ Options
**SRCPKGDEST=**"/path/to/folder":: If this value is not set, source package files will be stored in - PKGDEST. Many people like to keep all source package files in - a central location for easy cleanup, so this path can be set here. + in the current directory. Many people like to keep all source package files + in a central location for easy cleanup, so this path can be set here.
**PACKAGER=**"John Doe <john@example.com>":: This value is used when querying a package to see who was the builder. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0a90b89..493c962 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1744,7 +1744,7 @@ if [[ ! -w $SRCDEST ]] ; then fi
SRCPKGDEST=${_SRCPKGDEST:-$SRCPKGDEST} -SRCPKGDEST=${SRCPKGDEST:-$PKGDEST} #default to $PKGDEST if undefined +SRCPKGDEST=${SRCPKGDEST:-$startdir} #default to $startdir if undefined
if (( HOLDVER )) && [[ -n $FORCE_VER ]]; then -- 1.7.4
On 02/02/11 01:43, Dan McGee wrote:
On Tue, Feb 1, 2011 at 8:59 AM, Cedric Staniewski<cedric@gmx.ca> wrote:
The current behaviour, which is placing source packages in PKGDEST if SRCPKGDEST is not set, is inconsistent with {SRC,PKG}DEST handling and there is no real advantage in doing so. Other than preserving backward compatibility and the way it has worked for 2-3 years...
I don't have a super strong opinion, but to pretend like this isn't on purpose is not true at all.
I will give this an ack... Mainly because, if I wanted to set PKGDEST and keep SRCPKGDEST as the default (when both PKGDEST and SRCPKGDEST are unset - i.e. $startdir), it would not be obvious how to do this. And even though it is documented in the man page under SRCPKGDEST, it is not particularly obvious that adjusting PKGDEST will affect SRCPKGDEST. Allan
On Tue, Feb 1, 2011 at 11:54 PM, Allan McRae <allan@archlinux.org> wrote:
On 02/02/11 01:43, Dan McGee wrote:
On Tue, Feb 1, 2011 at 8:59 AM, Cedric Staniewski<cedric@gmx.ca> wrote:
The current behaviour, which is placing source packages in PKGDEST if SRCPKGDEST is not set, is inconsistent with {SRC,PKG}DEST handling and there is no real advantage in doing so.
Other than preserving backward compatibility and the way it has worked for 2-3 years...
I don't have a super strong opinion, but to pretend like this isn't on purpose is not true at all.
I will give this an ack...
Mainly because, if I wanted to set PKGDEST and keep SRCPKGDEST as the default (when both PKGDEST and SRCPKGDEST are unset - i.e. $startdir), it would not be obvious how to do this.
And even though it is documented in the man page under SRCPKGDEST, it is not particularly obvious that adjusting PKGDEST will affect SRCPKGDEST.
OK, I'll concede. -Dan
participants (3)
-
Allan McRae
-
Cedric Staniewski
-
Dan McGee