Changeset 2273


Ignore:
Timestamp:
Feb 5, 2010 7:39:52 PM (10 years ago)
Author:
wehart
Message:

Updating naming of CoinBazaar? projects. Although the user specifies 'neos' on the config line,
the project is really coin.neos.

Updating coopr_install with updates from pyutilib.virtualenv

Location:
coopr.misc/trunk/util
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • coopr.misc/trunk/util/README.txt

    r1893 r2273  
    11The coopr_install script is created by executing:
    22
    3   vpy_create coopr.py coopr_install
     3  lbin vpy_create coopr.py coopr_install
    44
    55The vpy_create command is provided by the pyutilib.virtualenv package.
  • coopr.misc/trunk/util/coopr.py

    r2191 r2273  
    3131                continue
    3232            if sys.version_info < (2,6,4):
    33                 self.add_repository(pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))
     33                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))
    3434            else:
    35                 self.add_repository(pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))
     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))
    3636
    3737
  • coopr.misc/trunk/util/coopr_install

    r2191 r2273  
    26912691#
    26922692def guess_release(svndir):
    2693     output = urllib2.urlopen(svndir).read()
     2693    output = urllib2.urlopen(svndir, timeout=30).read()
    26942694    if output=="":
    26952695       return None
     
    28182818    def guess_versions(self, offline=False):
    28192819        if not self.config.root is None:
     2820            rootdir_output = urllib2.urlopen(self.config.root, timeout=30).read()
    28202821            try:
    28212822                self.trunk = self.config.root+'/trunk'
     
    28252826                self.trunk_root = None
    28262827            try:
    2827                 if offline:
     2828                if offline or not 'stable' in rootdir_output:
    28282829                    raise IOError
    28292830                self.stable = guess_release(self.config.root+'/stable')
     
    28332834                self.stable_root = None
    28342835            try:
    2835                 if offline:
     2836                if offline or not 'releases' in rootdir_output:
    28362837                    raise IOError
    28372838                self.release = guess_release(self.config.root+'/releases')
     
    28402841            except (urllib2.HTTPError,IOError):
    28412842                try:
    2842                     if offline:
     2843                    if offline or not 'tags' in rootdir_output:
    28432844                        raise IOError
    28442845                    self.release = guess_release(self.config.root+'/tags')
     
    36193620            parser.readfp(fp, '<default configuration>')
    36203621        elif not os.path.exists(file):
     3622            if not '/' in file and not self.config_file is None:
     3623                file = os.path.dirname(self.config_file)+"/"+file
    36213624            try:
    3622                 output = urllib2.urlopen(file).read()
     3625                output = urllib2.urlopen(file, timeout=30).read()
    36233626            except Exception, err:
    36243627                print "Problems opening configuration url:",file
     
    38303833                continue
    38313834            if sys.version_info < (2,6,4):
    3832                 self.add_repository(pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))
     3835                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))
    38333836            else:
    3834                 self.add_repository(pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))
     3837                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))
    38353838
    38363839
Note: See TracChangeset for help on using the changeset viewer.