[pacman-dev] [PATCH] pactest/sync200: check for curl instead of fetch

Dave Reisner d at falconindy.com
Sat Aug 13 16:07:04 EDT 2011


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 at 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



More information about the pacman-dev mailing list