Fixes for install issues on Ubuntu 12.04

dwighthubbard · Aug 2, 2012 · f494bfc · f494bfc
1 parent 9f932ab
commit f494bfc
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 49 deletions.
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 import os
 from setuptools import setup
 """
- Copyright (c) 2010 Yahoo! Inc. All rights reserved.
+ Copyright (c) 2012 Yahoo! Inc. All rights reserved.
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
@@ -18,13 +18,13 @@
 
 setup(
   name="sshmap",
-  version="0.2.0",
+  version="0.2.10",
   author="Dwight Hubbard",
   author_email="dhubbard@yahoo-inc.com",
   url="http://www.yahoo.com",
   license="LICENSE.txt",
   packages=["sshmap"],
-  scripts=["sshmap"],
+  scripts=["sshmap/sshmap.py"],
   long_description=open('README.txt').read(),
   description="A SSH Multiplexer desgined to use ssh to perform map/reduce like operations",
   requires=['paramiko'],

diff --git a/sshmap/__init__.py b/sshmap/__init__.py
@@ -12,3 +12,6 @@
  See the License for the specific language governing permissions and
  limitations under the License. See accompanying LICENSE file.
 """
+from sshmap import *
+
+
diff --git a/sshmap/hostlists.py b/sshmap/hostlists.py
@@ -47,6 +47,9 @@ def _get_plugins():
 
 def expand(range_list):
     """ Expand a list of plugin:parameters into a list of hosts """
+    if type(range_list) is str:
+      range_list=[range_list]
+
     # Find all the host list plugins
     plugins=_get_plugins()
 

diff --git a/sshmap/hostlists/.svn/entries b/sshmap/hostlists/.svn/entries
diff --git a/sshmap/hostlists/plugins/files.py b/sshmap/hostlists/plugins/files.py
diff --git a/sshmap/sshmap.py b/sshmap/sshmap.py
@@ -2,7 +2,7 @@
 """ Python based ssh multiplexer optimized for map operations """
 
 """
- Copyright (c) 2010 Yahoo! Inc. All rights reserved.
+ Copyright (c) 2012 Yahoo! Inc. All rights reserved.
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
@@ -417,7 +417,7 @@ def run(range,command,username=None,password=None,sudo=False,script=None,timeout
   None
   """
   status_info(output_callback,' \bLooking up hosts')
-  hosts=hostlists.expandrange(range,compress=False).split(',')
+  hosts=hostlists.expand(range)
   if shuffle:
     random.shuffle(hosts)
   status_clear()