From: Daniel Walton <dwalton@cumulusnetworks.com>
Date: Thu, 20 Aug 2015 20:55:32 +0000 (-0700)
Subject: 'service quagga reload' fails if /etc/quagga/vtysh.conf does not exist
X-Git-Tag: frr-2.0-rc1~1278^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f850d14d6690d3b713be545e9f57623615aa7304;p=matthieu%2Ffrr.git

'service quagga reload' fails if /etc/quagga/vtysh.conf does not exist

Ticket: CM-7146
Reviewed By: teo@cumulusnetworks.com
Testing Done:

/usr/lib/quagga/quagga-reload.py needs to check that
/etc/quagga/vtysh.conf exists before trying to open it
---

diff --git a/tools/quagga-reload.py b/tools/quagga-reload.py
index d3b06daba2..1744a13365 100755
--- a/tools/quagga-reload.py
+++ b/tools/quagga-reload.py
@@ -468,16 +468,16 @@ if __name__ == '__main__':
 
     # Verify that 'service integrated-vtysh-config' is configured
     vtysh_filename = '/etc/quagga/vtysh.conf'
-    fh = open(vtysh_filename, 'r')
     service_integrated_vtysh_config = False
 
-    for line in fh.readlines():
-        line = line.strip()
+    if os.path.isfile(vtysh_filename):
+        with open(vtysh_filename, 'r') as fh:
+            for line in fh.readlines():
+                line = line.strip()
 
-        if line == 'service integrated-vtysh-config':
-            service_integrated_vtysh_config = True
-            break
-    fh.close()
+                if line == 'service integrated-vtysh-config':
+                    service_integrated_vtysh_config = True
+                    break
 
     if not service_integrated_vtysh_config:
         print "'service integrated-vtysh-config' is not configured, this is required for 'service quagga reload'"