Changeset 2354


Ignore:
Timestamp:
Feb 15, 2010 8:22:18 PM (9 years ago)
Author:
wehart
Message:

Merged revisions 2312-2353 via svnmerge from
https://software.sandia.gov/svn/public/coopr/coopr.misc/trunk

........

r2327 | jwatson | 2010-02-12 09:03:34 -0700 (Fri, 12 Feb 2010) | 3 lines


Added import of cPickle instead of pickle, if it exists.

........

r2341 | wehart | 2010-02-15 13:44:15 -0700 (Mon, 15 Feb 2010) | 2 lines


Extending definition of svn:ignore to include *.egg-info files.

........

Location:
coopr.misc/stable/2.2
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • coopr.misc/stable/2.2

  • coopr.misc/stable/2.2/admin

    • Property svn:ignore
      •  

        old new  
        22*.pyo
        33*.cover
         4*.egg-info
  • coopr.misc/stable/2.2/admin/pyomo

    • Property svn:ignore
      •  

        old new  
        22*.pyo
        33*.cover
         4*.egg-info
  • coopr.misc/stable/2.2/admin/pysos

    • Property svn:ignore
      •  

        old new  
        22*.pyo
        33*.cover
         4*.egg-info
  • coopr.misc/stable/2.2/coopr

    • Property svn:ignore set to
      *.pyc
      *.pyo
      *.cover
      *.egg-info
  • coopr.misc/stable/2.2/doc

    • Property svn:ignore set to
      *.pyc
      *.pyo
      *.cover
      *.egg-info
  • coopr.misc/stable/2.2/doc/pub

    • Property svn:ignore set to
      *.pyc
      *.pyo
      *.cover
      *.egg-info
  • coopr.misc/stable/2.2/scripts

    • Property svn:ignore
      •  

        old new  
        22*.pyo
        33*.cover
         4*.egg-info
  • coopr.misc/stable/2.2/scripts/pyro_mip_server

    r2312 r2354  
    1515
    1616import os
     17import os.path
    1718import sys
    1819from os.path import abspath, dirname
     
    2021sys.path.append(".")
    2122
     23try:
     24   import cPickle as pickle
     25except ImportError:
     26   import pickle
     27
     28import pyutilib.services
     29import pyutilib.pyro
     30
    2231import coopr.opt
    23 import pyutilib.pyro
    24 import sys
    25 import pyutilib.services
    26 import pickle
    27 import os.path
    2832
    2933class CooprMIPWorker(pyutilib.pyro.TaskWorker):
  • coopr.misc/stable/2.2/util

    • Property svn:ignore set to
      *.pyc
      *.pyo
      *.cover
      *.egg-info
  • coopr.misc/stable/2.2/util/coopr_install

    r2312 r2354  
    32523252
    32533253        parser.add_option('--config',
    3254             help='Add INI config files that specify the packages used in this installation. ',
     3254            help='Use an INI config file to specify the packages used in this installation.  Using this option clears the initial configuration, but multiple uses of this option will add package specifications.',
    32553255            action='append',
    32563256            dest='config_files',
    32573257            default=[])
    32583258
    3259         parser.add_option('--clear-config',
    3260             help='Clear any initial configuration data that was specified when constructing this installer.',
     3259        parser.add_option('--keep-config',
     3260            help='Keep the initial configuration data that was specified if the --config option is specified.',
    32613261            action='store_true',
    3262             dest='clear_config',
     3262            dest='keep_config',
    32633263            default=False)
    32643264
     
    33073307            self.logger.fatal("ERROR: cannot specify --config when specifying the --update option.")
    33083308            sys.exit(1000)
    3309         if options.update and options.clear_config:
    3310             self.logger.fatal("ERROR: cannot specify --clear-config when specifying the --update option.")
     3309        if options.update and options.keep_config:
     3310            self.logger.fatal("ERROR: cannot specify --keep-config when specifying the --update option.")
    33113311            sys.exit(1000)
    33123312        if len(args) > 1:
     
    33313331            self.config=None
    33323332            options.config_files.append( join(self.abshome_dir, 'admin', 'config.ini') )
    3333         if not self.config is None and not options.clear_config:
     3333        if not self.config is None and (len(options.config_files) == 0 or options.keep_config):
    33343334            fp = StringIO.StringIO(self.config)
    33353335            self.read_config_file(fp=fp)
    33363336            fp.close()
    3337         if not self.config_file is None and not options.clear_config:
     3337        if not self.config_file is None and (len(options.config_files) == 0 or options.keep_config):
    33383338            self.read_config_file(file=self.config_file)
    33393339        for file in options.config_files:
Note: See TracChangeset for help on using the changeset viewer.