Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   ArchLinux Pacman Development (http://www.linux-archive.org/archlinux-pacman-development/)
-   -   makepkg: Place source packages symlinks in build dir when SRCPKGDEST is used (http://www.linux-archive.org/archlinux-pacman-development/389716-makepkg-place-source-packages-symlinks-build-dir-when-srcpkgdest-used.html)

"Allan McRae" 06-23-2010 03:59 AM

makepkg: Place source packages symlinks in build dir when SRCPKGDEST is used
 
On 22/06/10 09:47, Eric Bélanger wrote:

Signed-off-by: Eric Bélanger<snowmaniscool@gmail.com>
---
scripts/makepkg.sh.in | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index dbc4047..83d656f 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -159,6 +159,16 @@ clean_up() {
fi
done
done
+
+ # clean up dangling symlinks to source packages
+ for pkg in ${pkgname[@]}; do
+ for file in ${pkg}-*-*-${CARCH}${SRCEXT}; do
+ if [[ -h $file&& ! -e $file ]]; then
+ rm -f $file
+ fi
+ done
+ done
+
fi
fi



I'd prefer just doing something like:

# clean up dangling symlinks to packages
for pkg in ${pkgname[@]}; do
for file in ${pkg}-*-*-${CARCH}${PKGEXT} ${pkg}-*-*-${CARCH}${SRCEXT}; do
if [[ -h $file && ! -e $file ]]; then

i.e. just adding to the previous loop.


The rest of the patch is fine.

Allan

"Allan McRae" 06-23-2010 06:16 AM

makepkg: Place source packages symlinks in build dir when SRCPKGDEST is used
 
On 23/06/10 15:35, Eric Bélanger wrote:

Signed-off-by: Eric Bélanger<snowmaniscool@gmail.com>
---
scripts/makepkg.sh.in | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index dbc4047..0219015 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -153,7 +153,7 @@ clean_up() {

# clean up dangling symlinks to packages
for pkg in ${pkgname[@]}; do
- for file in ${pkg}-*-*-${CARCH}${PKGEXT}; do
+ for file in ${pkg}-*-*-${CARCH}${PKGEXT} ${pkg}-*-*-${CARCH}${SRCEXT}; do


I decided ${pkg}-*-*-${CARCH}{${PKGEXT},${SRCEXT}} looked better, so I
push this patch to my working branch with that change.


Thanks,
Allan


All times are GMT. The time now is 10:55 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.