Skip to content

Commit

Permalink
[#2618] Rename config.ini resource.config to avoid .gitignore rules
Browse files Browse the repository at this point in the history
  • Loading branch information
tobes committed Aug 14, 2012
1 parent acfe3b2 commit f9f8b30
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions ckan/html_resources/__init__.py
@@ -1,13 +1,13 @@
''' This file creates fanstatic resources from the sub directories. The
directory can contain a config.ini to specify how the resources should
directory can contain a resource.config to specify how the resources should
be treated. minified copies of the resources are created if the resource
has a later modification time than existing minified versions.
NOTE :currently each library requires its entry point adding to the main
ckan setup.py file.
config.ini (example)
resource.config (example)
==========
# all resources are named without their file extension
[main]
Expand Down Expand Up @@ -230,7 +230,7 @@ def key(resource):

def create_library(name, path):
''' Creates a fanstatic library `name` with the contents of a
directory `path` using config.ini if found. Files are minified
directory `path` using resource.config if found. Files are minified
if needed. '''

def min_path(path):
Expand Down Expand Up @@ -277,7 +277,7 @@ def create_resource(path, lib_name, count):
if path in dont_bundle:
kw['dont_bundle'] = True
kw['custom_order'] = count
# FIXME needs config.ini options enabled
# FIXME needs resource.config options enabled
if False:
other_browsers = False
condition = ''
Expand All @@ -296,10 +296,10 @@ def create_resource(path, lib_name, count):
depends = {}
groups = {}

# parse the config.ini file if it exists
# parse the resource.config file if it exists
resource_path = os.path.dirname(__file__)
resource_path = os.path.join(resource_path, path)
config_path = os.path.join(resource_path, 'config.ini')
config_path = os.path.join(resource_path, 'resource.config')
if os.path.exists(config_path):
config = ConfigParser.RawConfigParser()
config.read(config_path)
Expand Down

0 comments on commit f9f8b30

Please sign in to comment.