punchboot 2.1.0__tar.gz → 2.2.0__tar.gz

{punchboot-2.1.0 → punchboot-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: punchboot
-Version: 2.1.0
+Version: 2.2.0
 Summary: Punchboot tools
 Home-page: https://github.com/jonasblixt/punchboot
 Author: Jonas Blixt

{punchboot-2.1.0 → punchboot-2.2.0}/punchboot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: punchboot
-Version: 2.1.0
+Version: 2.2.0
 Summary: Punchboot tools
 Home-page: https://github.com/jonasblixt/punchboot
 Author: Jonas Blixt

{punchboot-2.1.0 → punchboot-2.2.0}/tools/punchboot/punchboot/helpers.py

@@ -1,6 +1,7 @@
 """Various punchboot helper functions."""
 
 import uuid
+from importlib.metadata import version
 from typing import Iterable
 
 import _punchboot  # type: ignore
@@ -9,7 +10,7 @@ import semver
 
 def library_version() -> semver.Version:
     """Return the version string of the C library."""
-    return semver.Version.parse(_punchboot.version())
+    return semver.Version.parse(version('punchboot'))
 
 
 def pb_id(cmd: str) -> int:

{punchboot-2.1.0 → punchboot-2.2.0}/tools/punchboot/python_wrapper.c

@@ -24,17 +24,25 @@
 
 static int log_cb(struct pb_context *ctx, int level, const char *fmt, ...)
 {
-    static PyObject *logging = NULL;
+    static PyObject *logger = NULL;
     static PyObject *log_msg = NULL;
     char msg_buf[1024];
     int rc;
     (void)ctx;
     (void)level;
 
-    if (logging == NULL) {
-        logging = PyImport_ImportModuleNoBlock("logging");
+    if (logger == NULL) {
+        PyObject *logging = PyImport_ImportModuleNoBlock("logging");
         if (logging == NULL) {
             PyErr_SetString(PyExc_ImportError, "Could not import module 'logging'");
+            return -1;
+        }
+
+        logger = PyObject_CallMethod(logging, "getLogger", "s", "pb");
+
+        if (logger == NULL) {
+            PyErr_SetString(PyExc_RuntimeError, "Can't configure logger");
+            return -1;
         }
     }
 
@@ -48,7 +56,7 @@ static int log_cb(struct pb_context *ctx, int level, const char *fmt, ...)
             msg_buf[rc - 1] = 0;
 
         log_msg = Py_BuildValue("s", msg_buf);
-        PyObject_CallMethod(logging, "debug", "O", log_msg);
+        PyObject_CallMethod(logger, "debug", "O", log_msg);
         Py_DECREF(log_msg);
     }
     va_end(args);
@@ -1059,13 +1067,12 @@ static PyObject *wait_for_device(PyObject *self, PyObject *args, PyObject *kwds)
 
     while (true) {
         rc = init_transport(NULL, NULL, &ctx);
-        if (rc != PB_RESULT_OK) {
-            PyErr_SetString(PyExc_TimeoutError, "No device found");
-            return NULL;
+
+        if (rc == PB_RESULT_OK) {
+            rc = get_uuid(ctx, uuid);
+            pb_api_free_context(ctx);
         }
 
-        rc = get_uuid(ctx, uuid);
-        pb_api_free_context(ctx);
         if (rc != PB_RESULT_OK) {
             if (timeout > 0) {
                 sleep(1);