diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-07 10:46:27 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-07 10:46:27 -0400 |
| commit | 69f5a49af88de48a9c64f7c57abec8fc5dc41f45 (patch) | |
| tree | 22511fec3081282eec696ba926d0353e78285697 /src | |
| parent | b70e9d2ebf5c4bfb9de7dc6a52cb870e15ec4db3 (diff) | |
| download | bcfg2-69f5a49af88de48a9c64f7c57abec8fc5dc41f45.tar.gz bcfg2-69f5a49af88de48a9c64f7c57abec8fc5dc41f45.tar.bz2 bcfg2-69f5a49af88de48a9c64f7c57abec8fc5dc41f45.zip | |
fixed long lines
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/Chkconfig.py | 3 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/SSHbase.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/Chkconfig.py b/src/lib/Bcfg2/Client/Tools/Chkconfig.py index b1f0b6fa1..c3dcf7796 100644 --- a/src/lib/Bcfg2/Client/Tools/Chkconfig.py +++ b/src/lib/Bcfg2/Client/Tools/Chkconfig.py @@ -65,7 +65,8 @@ class Chkconfig(Bcfg2.Client.Tools.SvcTool): self.cmd.run("/sbin/chkconfig --add %s" % (entry.attrib['name'])) self.logger.info("Installing Service %s" % (entry.get('name'))) rv = True - if entry.get('status') == 'off' or self.setup["servicemode"] == "build": + if (entry.get('status') == 'off' or + self.setup["servicemode"] == "build"): rv &= self.cmd.run((rcmd + " --level 0123456") % (entry.get('name'), entry.get('status'))).success diff --git a/src/lib/Bcfg2/Server/Plugins/SSHbase.py b/src/lib/Bcfg2/Server/Plugins/SSHbase.py index 5aa7c4d9e..d8b3104b7 100644 --- a/src/lib/Bcfg2/Server/Plugins/SSHbase.py +++ b/src/lib/Bcfg2/Server/Plugins/SSHbase.py @@ -288,7 +288,8 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, else: # need to add entry try: - ipaddr = set([addr[0] for (_, _, _, _, addr) in socket.getaddrinfo(client, None)]) + ipaddr = set([info[4][0] + for info in socket.getaddrinfo(client, None)]) self.ipcache[client] = (ipaddr, client) return (ipaddr, client) except socket.gaierror: |