FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > ArchLinux > ArchLinux Pacman Development

 
 
LinkBack Thread Tools
 
Old 06-28-2011, 12:54 PM
Allan McRae
 
Default makepkg: fix removing symbolic link

The path was not being stripped from $file before prefixing with
$srcdir resulting in the attempted removal of a very weird
filename.

Signed-off-by: Allan McRae <allan@archlinux.org>
---
scripts/makepkg.sh.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index ed5cdef..edfa9e3 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -518,7 +518,7 @@ download_sources() {
local file=$(get_filepath "$netfile" || true)
if [[ -n "$file" ]]; then
msg2 "$(gettext "Found %s")" "${file##*/}"
- rm -f "$srcdir/$file"
+ rm -f "$srcdir/${file##*/}"
ln -s "$file" "$srcdir/"
continue
fi
--
1.7.6
 
Old 06-29-2011, 06:05 AM
Allan McRae
 
Default makepkg: fix removing symbolic link

The path was not being stripped from $file before prefixing with
$srcdir resulting in the attempted removal of a very weird
filename.

Signed-off-by: Allan McRae <allan@archlinux.org>
---
scripts/makepkg.sh.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index ed5cdef..edfa9e3 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -518,7 +518,7 @@ download_sources() {
local file=$(get_filepath "$netfile" || true)
if [[ -n "$file" ]]; then
msg2 "$(gettext "Found %s")" "${file##*/}"
- rm -f "$srcdir/$file"
+ rm -f "$srcdir/${file##*/}"
ln -s "$file" "$srcdir/"
continue
fi
--
1.7.6
 
Old 06-29-2011, 08:19 PM
Rémy Oudompheng
 
Default makepkg: fix removing symbolic link

On Wed 29 June 2011 at 16:05 +1000, Allan McRae wrote:
> The path was not being stripped from $file before prefixing with
> $srcdir resulting in the attempted removal of a very weird
> filename.
>
> Signed-off-by: Allan McRae <allan@archlinux.org>

Signed-off-by: Rémy Oudompheng <remy@archlinux.org>

This is indeed annoying.

--
Rémy.
 
Old 06-29-2011, 08:19 PM
Rémy Oudompheng
 
Default makepkg: fix removing symbolic link

On Wed 29 June 2011 at 16:05 +1000, Allan McRae wrote:
> The path was not being stripped from $file before prefixing with
> $srcdir resulting in the attempted removal of a very weird
> filename.
>
> Signed-off-by: Allan McRae <allan@archlinux.org>

Signed-off-by: Rémy Oudompheng <remy@archlinux.org>

This is indeed annoying.

--
Rémy.
 

Thread Tools




All times are GMT. The time now is 12:37 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright ©2007 - 2008, www.linux-archive.org