clearlinux/autospec
2
0
Fork 0
mirror of https://github.com/clearlinux/autospec.git synced 2026-08-22 15:36:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

config: skip tracking of the 'packages' file

Browse Source 
This 'packages' file looks like a config file, but because it typically
exists outside the package git repo, we want avoid a later attempt to
commit it.

This change also makes the "fatal: pathspec 'packages' did not match any
files" error message disappear.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
This commit is contained in:
Patrick McCarty
2019-06-24 15:27:42 -07:00
committed by William Douglas
parent 24837cf7ad
commit 3552dff8db
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autospec/config.py
+9 -5
View File
@@ -432,11 +432,15 @@ def filter_blanks(lines):
return [l.strip() for l in lines if not l.strip().startswith("#") and l.split()]
def read_conf_file(path):
"""Read configuration file at path."""
def read_conf_file(path, track=True):
"""
Read configuration file at path. If the config file does not exist (or is
not expected to exist) in the package git repo, specify 'track=False'.
"""
try:
with open(path, "r") as f:
config_files.add(os.path.basename(path))
if track:
config_files.add(os.path.basename(path))
return filter_blanks(f.readlines())
except EnvironmentError:
return []
@@ -614,9 +618,9 @@ def parse_config_files(path, bump, filemanager, version):
yum_conf = os.path.join(os.path.dirname(config_file), "image-creator/yum.conf")
if packages_file:
os_packages = set(read_conf_file(packages_file))
os_packages = set(read_conf_file(packages_file, track=False))
else:
os_packages = set(read_conf_file("~/packages"))
os_packages = set(read_conf_file("~/packages", track=False))
wrapper = textwrap.TextWrapper()
wrapper.initial_indent = "# "