entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 36 Releases Activity

hobo: don't ignore ignore_timestamp when configuring site options (#7500)

This commit is contained in:
Frédéric Péters 2015-06-08 16:24:25 +02:00
parent 4d1119ca47
commit fd74f3b068
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wcs/ctl/check_hobos.py
View File

@ -87,11 +87,11 @@ class CmdCheckHobos(Command):
new_site = False
try:
self.configure_site_options(service, pub)
self.configure_site_options(service, pub,
ignore_timestamp=sub_options.ignore_timestamp)
except NoChange:
if not sub_options.ignore_timestamp:
print ' skipping'
return
print ' skipping'
return
pub.set_config()
self.update_configuration(service, pub)
@ -220,18 +220,19 @@ class CmdCheckHobos(Command):
instance_path = '%s+' % parsed_url.path.replace('/', '+')
return instance_path
def configure_site_options(self, current_service, pub):
def configure_site_options(self, current_service, pub, ignore_timestamp=False):
# configure site-options.cfg
config = ConfigParser.RawConfigParser()
site_options_filepath = os.path.join(pub.app_dir, 'site-options.cfg')
if os.path.exists(site_options_filepath):
config.read(site_options_filepath)
try:
if config.get('hobo', 'timestamp') == self.all_services.get('timestamp'):
raise NoChange()
except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
pass
if not ignore_timestamp:
try:
if config.get('hobo', 'timestamp') == self.all_services.get('timestamp'):
raise NoChange()
except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
pass
if not 'hobo' in config.sections():
config.add_section('hobo')