x/anvil
Code Issues Proposed changes

Updated to show which file we joined with.

Browse Source
This commit is contained in:
Joshua Harlow 2012-02-10 18:13:11 -08:00
parent 8b047e7534
commit 93200b675f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/components/glance.py
View File

@ -126,12 +126,12 @@ class GlanceInstaller(comp.PythonInstallComponent):
if config_fn == API_CONF: if config_fn == API_CONF:
(fn, top) = utils.load_template(self.component_name, API_CONF) (fn, top) = utils.load_template(self.component_name, API_CONF)
(_, bottom) = self._get_source_config(API_PASTE_CONF) (_, bottom) = self._get_source_config(API_PASTE_CONF)
combined = [top, "### Joined here on %s" % (date.rcf8222date()), bottom] combined = [top, "### Joined here on %s with file %s" % (date.rcf8222date(), API_PASTE_CONF), bottom]
return (fn, utils.joinlinesep(*combined)) return (fn, utils.joinlinesep(*combined))
if config_fn == REG_CONF: if config_fn == REG_CONF:
(fn, top) = utils.load_template(self.component_name, REG_CONF) (fn, top) = utils.load_template(self.component_name, REG_CONF)
(_, bottom) = self._get_source_config(REG_PASTE_CONF) (_, bottom) = self._get_source_config(REG_PASTE_CONF)
combined = [top, "### Joined here on %s" % (date.rcf8222date()), bottom] combined = [top, "### Joined here on %s with file %s" % (date.rcf8222date(), REG_PASTE_CONF), bottom]
return (fn, utils.joinlinesep(*combined)) return (fn, utils.joinlinesep(*combined))
return comp.PythonInstallComponent._get_source_config(self, config_fn) return comp.PythonInstallComponent._get_source_config(self, config_fn)