Skip to content

introducing shlex for cmd spliting #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ramkrsna wants to merge 1 commit into
base: master
Choose a base branch
from
Open

introducing shlex for cmd spliting #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions zeroconf/actions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import socket
from zeroconf import ServiceBrowser, ServiceStateChange, Zeroconf
from subprocess import Popen, PIPE
import shlex
import xmltodict

__all__ = [
Expand Down Expand Up @@ -39,7 +40,7 @@ def connected_peers():
"""
peers = []

cli = Popen('gluster --xml pool list', shell=True, stdout=PIPE, stderr=PIPE)
cli = Popen(shlex.split('gluster --xml pool list', shell=False, stdout=PIPE, stderr=PIPE))
(out, err) = cli.communicate()
# TODO: catch errors (not even xml format when glusterd is not running)

Expand Down Expand Up @@ -80,7 +81,7 @@ def connected_peers():
def peer_probe(hostname):
""" Run 'gluster peer probe $hostname' against the given hostname (or IP).
"""
cli = Popen('gluster --xml peer probe %s' % hostname, shell=True, stdout=PIPE, stderr=PIPE)
cli = Popen(shlex.split('gluster --xml peer probe %s' % hostname, shell=False, stdout=PIPE, stderr=PIPE))
(out, err) = cli.communicate()

# TODO: catch errors
Expand Down
2 changes: 1 addition & 1 deletion zeroconf/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.1.0'
__version__ = '0.1.3'