summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2011-08-12 16:45:04 -0400
committerDan McGee <dan@archlinux.org>2011-08-15 06:29:09 -0500
commitce8f91a71b2e5d50fe60baadc0269e6823e8056f (patch)
treef056c46a87eda0f549ff62d7b3bcadea0f383e68
parent6bf60568f8a956c980accdc6ae86c918eee5a881 (diff)
downloadpacman-ce8f91a71b2e5d50fe60baadc0269e6823e8056f.tar.xz
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> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--test/pacman/tests/Makefile.am2
-rw-r--r--test/pacman/tests/sync200.py.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/pacman/tests/Makefile.am b/test/pacman/tests/Makefile.am
index b793687b..15720f9b 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 c83e9ac7..6e47112d 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")