Salastil/weather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add /etc/weather/weatherrc to config search.

Browse Source 
* weather.1(INPUT FILES): Updated the list of potential weatherrc
locations to reflect those mentioned in the INSTALL file, particularly
the addition of /etc/weather/weatherrc in the 2.0 release.

* weather.py(get_config): Adjusted the configuration search locations to
include /etc/weather/weatherrc, since the INSTALL file started
mentioning it in the 2.0 release even though it wasn't actually
implemented as pointed out by Ben Kohler.
This commit is contained in:
Jeremy Stanley
2012-08-30 11:13:57 +00:00
parent 88d6a8444c
commit 13eb635aca
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
weather.1
View File

@@ -201,7 +201,7 @@ The file format and configuration options are described in
. .
They are aggregated in the following order: They are aggregated in the following order:
.TP .TP
.I /etc/weatherrc .I /etc/weatherrc " or " /etc/weather/weatherrc
the system-wide configuration the system-wide configuration
.TP .TP
.IR ~/.weather/weatherrc " or " ~/.weatherrc .IR ~/.weather/weatherrc " or " ~/.weatherrc

1
weather.py
View File

@@ -609,6 +609,7 @@ def get_config():
import os import os
rcfiles = [ rcfiles = [
"/etc/weatherrc", "/etc/weatherrc",
"/etc/weather/weatherrc",
os.path.expanduser("~/.weather/weatherrc"), os.path.expanduser("~/.weather/weatherrc"),
os.path.expanduser("~/.weatherrc"), os.path.expanduser("~/.weatherrc"),
"weatherrc" "weatherrc"