[node-patches] Change in ovirt-node[master]: We should cat the old snmp_conf, not the snmp_conf dir

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: We should cat the old snmp_conf, not the snmp_conf dir
......................................................................

We should cat the old snmp_conf, not the snmp_conf dir

Missed during the code review from the last patch -- don't try to
cat a directory. cat the conf instead.

Change-Id: I2662ca403f99de9c5c9f9603e27b2407d44c431b
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1261424
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M src/ovirt/node/setup/snmp/snmp_model.py
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/34/50634/1

diff --git a/src/ovirt/node/setup/snmp/snmp_model.py b/src/ovirt/node/setup/snmp/snmp_model.py
index 5be0507..744ef4c 100644
--- a/src/ovirt/node/setup/snmp/snmp_model.py
+++ b/src/ovirt/node/setup/snmp/snmp_model.py
@@ -44,7 +44,8 @@
     else:
         conf = snmp_conf
 
-    cmd = "cat %s | grep createUser | grep -v '^#' | awk '{print $4}'" % conf
+    cmd = "cat %s | grep createUser | grep -v '^#' | awk '{print $4}'" % \
+          old_conf
     oldpwd = process.pipe(cmd, shell=True).strip()
 
     if len(oldpwd) > 0:


-- 
To view, visit https://gerrit.ovirt.org/50634
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2662ca403f99de9c5c9f9603e27b2407d44c431b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>