summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-09-18 14:10:07 -0400
committerTim Rozet <trozet@redhat.com>2017-09-20 14:42:52 +0000
commit62b4d6bddc724219facb0ff1da3104d6be29b7ca (patch)
tree677f59de782a19fb40543b4f4c4813ac85e86e7e
parent1768744b3adf8af0d317ee7d9d16d232f5c59d1f (diff)
Minor fixes to clean
Also adds hidden files (like IDE configs) to gitignore Change-Id: Ief595c41c5b4f0fe058f7b774f7a2aefdab733a4 Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit 024eb9f773d716e041f064c669690e0e2a727877)
-rw-r--r--.gitignore10
-rw-r--r--apex/clean.py1
-rw-r--r--apex/network/jumphost.py3
3 files changed, 5 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index 47eaef64..f42d4c6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,11 @@
*~
*.pyc
-.*.sw?
-.coverage
/docs_build/
/docs_output/
/releng/
-.build/
-.cache/
-ci/apex_build.log
-ci/apex_deploy.log
-.tox/
apex.egg-info/
/apex/tests/playbooks/*.retry
coverage.xml
nosetests.xml
-ci/apex_clean.log
+ci/*.log
+.*
diff --git a/apex/clean.py b/apex/clean.py
index efea0ff2..9d0e648e 100644
--- a/apex/clean.py
+++ b/apex/clean.py
@@ -134,5 +134,6 @@ def main():
logging.info('Apex clean complete!')
+
if __name__ == '__main__':
main()
diff --git a/apex/network/jumphost.py b/apex/network/jumphost.py
index 96b06cba..c28c105e 100644
--- a/apex/network/jumphost.py
+++ b/apex/network/jumphost.py
@@ -297,6 +297,7 @@ def remove_ovs_bridge(network):
"ifcfg-{}".format(bridge))
if os.path.isfile(bridge_ifcfg_file):
os.remove(bridge_ifcfg_file)
- logging.debug("Bridge ifcfg file removed: {}".format)
+ logging.debug("Bridge ifcfg file removed: {}".format(
+ bridge_ifcfg_file))
else:
logging.debug('Bridge ifcfg file not found')