fixup! fixup! add detection for custom libraries registered by ld.so.conf

Author: PeterMocary

repos/system_upgrade/common/actors/checkldsoconf/libraries/checkldsoconfiguration.py

@@ -36,16 +36,16 @@ def _report_custom_ld_so_configuration(summary):
 def _is_modified(config_path, package_name):
     """ Decide if the configuration file was modified based on the package it belongs to. """
     is_modified = False
-    try:
-        run(['rpm', '-Va', package_name])
-    except CalledProcessError as err:
-        modified_files = err.stdout
-        for line in modified_files.split('\n'):
-            line = line.split(' ')
-            modification_flags, file_path = line[0].strip(), line[-1].strip()
-            # Note that the condition is relaxed so that files different only
-            # in the modification timestamp won't be considered as modified.
-            is_modified |= config_path == file_path and modification_flags.strip('.') != 'T'
+    result = run(['rpm', '-Va', package_name], checked=False)
+    if result['exit_code'] == 0:
+        return is_modified
+    modified_files = result['stdout']
+    for line in modified_files.split('\n'):
+        line = line.split(' ')
+        modification_flags, file_path = line[0].strip(), line[-1].strip()
+        # Note that the condition is relaxed so that files different only
+        # in the modification timestamp won't be considered as modified.
+        is_modified |= config_path == file_path and modification_flags.strip('.') != 'T'
     return is_modified
 
 

repos/system_upgrade/common/actors/checkldsoconf/tests/test_checkldsoconfiguration.py

@@ -111,11 +111,11 @@ def mocked_read_file(path):
                              '', False)
                          ])
 def test_is_modified(monkeypatch, config_path, package_name, run_result, is_modified):
-    def mocked_run(command):
+    def mocked_run(command, checked):
         assert package_name in command
-        if run_result:
-            raise CalledProcessError("message", command, {'stdout': run_result})
-        return ''
+        assert checked is False
+        exit_code = 1 if run_result else 0
+        return {'stdout': run_result, 'exit_code': exit_code}
 
     monkeypatch.setattr(checkldsoconfiguration, 'run', mocked_run)