From 7ab39f9d42dbbf9ef039712a841c28e6261dcb28 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Thu, 19 Jan 2023 18:35:38 +0100 Subject: [PATCH] make the user2uid/group2gid win32 hack behave more like the real code (e.g. posix) The code relies on them returning the default value (usually None), if we call user2uid(None) or group2gid(None) (same for empty string). --- src/borg/platform/windows.pyx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/borg/platform/windows.pyx b/src/borg/platform/windows.pyx index 96cd426f..16b3f154 100644 --- a/src/borg/platform/windows.pyx +++ b/src/borg/platform/windows.pyx @@ -21,6 +21,9 @@ def uid2user(uid, default=None): @lru_cache(maxsize=None) def user2uid(user, default=None): + if not user: + # user is either None or the empty string + return default return 0 @@ -31,6 +34,9 @@ def gid2group(gid, default=None): @lru_cache(maxsize=None) def group2gid(group, default=None): + if not group: + # group is either None or the empty string + return default return 0