p3lib 1.1.71__tar.gz → 1.1.73__tar.gz

{p3lib-1.1.71 → p3lib-1.1.73}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.71
+Version: 1.1.73
 Summary: A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.
 Home-page: https://github.com/pjaos/p3lib
 Author: Paul Austen

{p3lib-1.1.71 → p3lib-1.1.73}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = p3lib
-version = 1.1.71
+version = 1.1.73
 author = Paul Austen
 author_email = pausten.os@gmail.com
 description = A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.

{p3lib-1.1.71 → p3lib-1.1.73}/src/p3lib/database_if.py

@@ -154,7 +154,7 @@ class DatabaseIF(object):
 
     def connectNoDB(self):
         """@brief connect to the database server."""
-        self._info("Connecting to {}:{}".format(self._dbConfig.serverAddress, self._dbConfig.serverPort))
+        self._info("Connecting to database server @ {}:{}".format(self._dbConfig.serverAddress, self._dbConfig.serverPort))
         self._dbCon = mysqldb.Connection(host=self._dbConfig.serverAddress,\
                                                 port=self._dbConfig.serverPort,\
                                                 user=self._dbConfig.username,\

{p3lib-1.1.71 → p3lib-1.1.73}/src/p3lib/ssh.py

@@ -122,6 +122,7 @@ class SSH(object):
     PRIVATE_KEY_FILE_LIST               = ["id_rsa", "id_dsa", 'id_ecdsa']
     PUBLIC_KEY_FILE_LIST                = ["id_rsa.pub", "id_dsa.pub", 'id_ecdsa.pub']
     LOCAL_SSH_CONFIG_PATH               = os.path.join(os.path.expanduser("~"), ".ssh")
+    DEFAULT_REMOTE_SSH_CONFIG_FOLDER    = "~/.ssh"
     DEFAULT_REMOTE_SSH_AUTH_KEYS_FILE   = "~/.ssh/authorized_keys"
     DROPBEAR_DIR                        = "/etc/dropbear"
     DROPBEAR_AUTH_KEYS_FILE             = "%s/authorized_keys" % (DROPBEAR_DIR)
@@ -520,8 +521,17 @@ class SSH(object):
 
         cmd = "test -d %s" % (SSH.DROPBEAR_DIR)
         rc, stdoutLines, stderrLines = self.runCmd(cmd, throwError=False)
+        # If the ssh server uses dropbear
         if rc == 0:
             authKeysFile = SSH.DROPBEAR_AUTH_KEYS_FILE
+        else:
+            # Check for the users ssh config folder
+            cmd = "test -d %s" % (SSH.DEFAULT_REMOTE_SSH_CONFIG_FOLDER)
+            rc, stdoutLines, stderrLines = self.runCmd(cmd, throwError=False)
+            if rc != 0:
+                # If the remote ssh config folder does not exist, create it
+                cmd = f"mkdir {SSH.DEFAULT_REMOTE_SSH_CONFIG_FOLDER}"
+                rc, stdoutLines, stderrLines = self.runCmd(cmd, throwError=True)
 
         return authKeysFile
 

{p3lib-1.1.71 → p3lib-1.1.73}/src/p3lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.71
+Version: 1.1.73
 Summary: A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.
 Home-page: https://github.com/pjaos/p3lib
 Author: Paul Austen