Changeset 2384

Timestamp:

Feb 22, 2010 12:54:39 AM (11 years ago)

Author:

wehart

Message:

Updated coopr_install due to changes
in pyutilib.virtual that check to ensure that
urlopen() is called with the correct arguments.

Added a warning when installing with Python 2.4

Location:

coopr.misc/trunk/util

Files:

• coopr.py (modified) (1 diff)
• coopr_install (modified) (4 diffs)

coopr.misc/trunk/util/coopr.py

@@ -35 +35 @@
                 self.add_repository('coopr.'+pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/coopr.'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))
 
+    def install_packages(self, options):
+        Installer.install_packages(self, options)
+        if sys.version_info[:2] < (2,5):
+            print ""
+            print "-----------------------------------------------------------------"
+            print " WARNING: Most Coopr packages will only work with Python 2.5 or"
+            print "          newer.  You have installed Coopr with:"
+            print sys.version
+            print "-----------------------------------------------------------------"
+
+            print ""
 
 def create_installer():

coopr.misc/trunk/util/coopr_install

@@ -2706 +2706 @@
         #print versions
     else:
-        output = urllib2.urlopen(svndir, timeout=30).read()
+        if sys.version_info[:2] <= (2,5):
+            output = urllib2.urlopen(svndir).read()
+        else:
+            output = urllib2.urlopen(svndir, timeout=30).read()
         if output=="":
             return None
@@ -2836 +2839 @@
                 rootdir_output = commands.getoutput('svn ls ' + self.config.root)
             else:
-                rootdir_output = urllib2.urlopen(self.config.root, timeout=30).read()
+                if sys.version_info[:2] <= (2,5):
+                    rootdir_output = urllib2.urlopen(self.config.root).read()
+                else:
+                    rootdir_output = urllib2.urlopen(self.config.root, timeout=30).read()
             try:
                 self.trunk = self.config.root+'/trunk'
@@ -3641 +3647 @@
                 file = os.path.dirname(self.config_file)+"/"+file
             try:
-                output = urllib2.urlopen(file, timeout=30).read()
+                if sys.version_info[:2] <= (2,5):
+                    output = urllib2.urlopen(file).read()
+                else:
+                    output = urllib2.urlopen(file, timeout=30).read()
             except Exception, err:
                 print "Problems opening configuration url:",file
@@ -3855 +3864 @@
                 self.add_repository('coopr.'+pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/coopr.'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))
 
+    def install_packages(self, options):
+        Installer.install_packages(self, options)
+        if sys.version_info[:2] < (2,5):
+            print ""
+            print "-----------------------------------------------------------------"
+            print " WARNING: Most Coopr packages will only work with Python 2.5 or"
+            print "          newer.  You have installed Coopr with:"
+            print sys.version
+            print "-----------------------------------------------------------------"
+
+            print ""
 
 def create_installer():