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 08-13-2011, 08:07 PM
Dave Reisner
 
Default pactest/sync200: check for curl instead of fetch

We can't just check for LIBS as curl won't be listed. Instead, look at
the length of the LIBCURL var from the Makefile.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
---
test/pacman/tests/Makefile.am | 2 +-
test/pacman/tests/sync200.py.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pacman/tests/Makefile.am b/test/pacman/tests/Makefile.am
index b793687..15720f9 100644
--- a/test/pacman/tests/Makefile.am
+++ b/test/pacman/tests/Makefile.am
@@ -12,7 +12,7 @@ CLEANFILES = $(CONFTESTS)

#### Taken from the autoconf scripts Makefile.am ####
edit = sed
- -e 's|@LIBS[@]|$(LIBS)|g'
+ -e 's|@LIBCURL[@]|$(LIBCURL)|g'
-e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g'


diff --git a/test/pacman/tests/sync200.py.in b/test/pacman/tests/sync200.py.in
index c83e9ac..6e47112 100644
--- a/test/pacman/tests/sync200.py.in
+++ b/test/pacman/tests/sync200.py.in
@@ -1,6 +1,6 @@
self.description = "Synchronize the local database"

-if not "fetch" in "@LIBS@":
+if len("@LIBCURL@") == 0:
self.option['XferCommand'] = ['/usr/bin/curl %u > %o']

sp1 = pmpkg("spkg1", "1.0-1")
--
1.7.6
 

Thread Tools




All times are GMT. The time now is 04:42 AM.

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