From: DRC <dcommander@users.sourceforge.net>
Date: Fri, 10 Apr 2009 20:08:03 +0000 (+0000)
Subject: Fix script to work with Python 2.3
X-Git-Tag: v0.0.90~24
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=651189aab937163cd15c4f426bc7441e758800e6;p=tigervnc.git

Fix script to work with Python 2.3



git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3767 3789f03b-4d11-0410-bbf8-ca57d06f2519
---

diff --git a/unix/download-xorg b/unix/download-xorg
index 74768fa7..1f4872f5 100755
--- a/unix/download-xorg
+++ b/unix/download-xorg
@@ -3,7 +3,13 @@
 
 import os
 import glob
-import subprocess
+
+hassubprocess = 1
+
+try:
+    import subprocess
+except ImportError:
+    hassubprocess = 0
 
 #INDI = "http://ftp.sunet.se/pub/X11/ftp.x.org/individual"
 INDI = "http://ftp.x.org/pub/individual/"
@@ -76,7 +82,9 @@ def main():
     for pkg in packages.keys():
         loc = packages[pkg]
         fname = pkg + ".tar.bz2"
-        assert 0 == subprocess.call(["wget", "-N", "-c", "-O", fname, loc])
-
+        if hassubprocess == 1:
+            assert 0 == subprocess.call(["wget", "-N", "-c", "-O", fname, loc])
+        else:
+            assert 0 == os.spawnvp(os.P_WAIT, "wget", ["-N", "-c", "-O", fname, loc])
 
 main()