Enable packages metadata to be float when int is expected (gh#uyuni-project/uyuni#9613)

python/spacewalk/server/importlib/backend.py

@@ -3360,16 +3360,21 @@ def _buildDatabaseValue(row, fieldsHash):
 def _buildExternalValue(dict, entry, tableObj):
     # updates dict with values from entry
     # entry is a hash-like object (non-db)
-    for f, datatype in list(tableObj.getFields().items()):
-        if f in dict:
+    for field, datatype in list(tableObj.getFields().items()):
+        if field in dict:
             # initialized somewhere else
             continue
         # Get the attribute's name
-        attr = tableObj.getObjectAttribute(f)
+        attr = tableObj.getObjectAttribute(field)
         # Sanitize the value according to its datatype
         if attr not in entry:
             entry[attr] = None
-        dict[f] = sanitizeValue(entry[attr], datatype)
+        try:
+            dict[field] = sanitizeValue(entry[attr], datatype)
+        except ValueError as e:
+            raise ValueError(
+                f"Cannot sanitize value from {field}={entry[attr]} to {type(datatype)}"
+            ) from e
 
 
 # pylint: disable-next=invalid-name

python/spacewalk/server/importlib/backendLib.py

@@ -494,15 +494,7 @@ def query(self, values):
 
 def sanitizeValue(value, datatype):
     if isinstance(datatype, DBstring):
-        if value is None or value == "":
-            return None  # we really want to preserve Nones
-            # and not depend on Oracle converting
-            # empty strings to NULLs -- PostgreSQL
-            # does not do this
-        if len(value) > datatype.limit:
-            value = value[: datatype.limit]
-            # ignore incomplete characters created after truncating
-        return value
+        return _sanitize_dbstring(value, datatype)
     if isinstance(datatype, DBblob):
         if value is None:
             value = ""
@@ -518,7 +510,22 @@ def sanitizeValue(value, datatype):
     if isinstance(datatype, DBdate):
         return str(value)[:10]
     if isinstance(datatype, DBint):
-        return int(value)
+        try:
+            return int(float(value))
+        except ValueError as e:
+            raise ValueError(f"Cannot convert {value} to int") from e
+    return value
+
+
+def _sanitize_dbstring(value, datatype):
+    if value is None or value == "":
+        return None  # we really want to preserve Nones
+        # and not depend on Oracle converting
+        # empty strings to NULLs -- PostgreSQL
+        # does not do this
+    if len(value) > datatype.limit:
+        value = value[: datatype.limit]
+        # ignore incomplete characters created after truncating
     return value
 
 

python/spacewalk/spacewalk-backend.changes.mczernek.round-int-values

@@ -0,0 +1 @@
+- Cast float pkg metadata to int (gh#uyuni-project/uyuni#9613)