f5f073 Backport bugfixes from upstream

Authored and Committed by msekleta 2 years ago
    Backport bugfixes from upstream
    
    Most notably this commit fixes #1419501 that caused mock traceback when
    running with --new-chroot.
    
    Resolves: #1419501
    
        
file modified
+18 -1