Merge branch 'cmiksche-master-patch-36978' into 'master'
fix issue when only uri_list and no uri is configured Closes #58 See merge request chaica/feed2toot!16
This commit is contained in:
commit
9b0e31b0e9
1 changed files with 5 additions and 1 deletions
|
@ -94,7 +94,11 @@ class ConfParse:
|
||||||
############
|
############
|
||||||
# uri option
|
# uri option
|
||||||
############
|
############
|
||||||
options['rss_uri'], feed, feedname, options['nopatternurinoglobalpattern'] = parseuri(config, self.clioptions.rss_uri, feeds, ignore_ssl)
|
if config.has_option('rss', 'uri') or self.clioptions.rss_uri:
|
||||||
|
options['rss_uri'], feed, feedname, options['nopatternurinoglobalpattern'] = parseuri(config, self.clioptions.rss_uri, feeds, ignore_ssl)
|
||||||
|
else:
|
||||||
|
if config.has_option('rss', 'no_uri_pattern_no_global_pattern'):
|
||||||
|
options['nopatternurinoglobalpattern'] = config.getboolean('rss', 'no_uri_pattern_no_global_pattern')
|
||||||
###########################
|
###########################
|
||||||
# the cache section
|
# the cache section
|
||||||
###########################
|
###########################
|
||||||
|
|
Loading…
Reference in a new issue