From 4e581c59da6724ac8637586856541059880ab41b Mon Sep 17 00:00:00 2001
From: ed <s@ocv.me>
Date: Mon, 12 Aug 2024 17:45:19 +0000
Subject: [PATCH] fix s390x w/a, up2k name-randomizer

---
 copyparty/stolen/ifaddr/__init__.py | 8 +++++++-
 copyparty/up2k.py                   | 4 ++--
 scripts/docker/innvikler.sh         | 6 ------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/copyparty/stolen/ifaddr/__init__.py b/copyparty/stolen/ifaddr/__init__.py
index ab7679ae..5e8b7827 100644
--- a/copyparty/stolen/ifaddr/__init__.py
+++ b/copyparty/stolen/ifaddr/__init__.py
@@ -16,7 +16,13 @@ def nope(include_unconfigured=False):
     return []
 
 
-if os.environ.get("PRTY_NO_IFADDR") or os.uname().machine == "s390x":
+try:
+    S390X = os.uname().machine == "s390x"
+except:
+    S390X = False
+
+
+if os.environ.get("PRTY_NO_IFADDR") or S390X:
     # s390x deadlocks at libc.getifaddrs
     get_adapters = nope
 elif os.name == "nt":
diff --git a/copyparty/up2k.py b/copyparty/up2k.py
index 359c8509..8e29160e 100644
--- a/copyparty/up2k.py
+++ b/copyparty/up2k.py
@@ -2757,7 +2757,7 @@ class Up2k(object):
                         job = deepcopy(job)
                         job["wark"] = wark
                         job["at"] = cj.get("at") or time.time()
-                        for k in "lmod ptop vtop prel host user addr".split():
+                        for k in "lmod ptop vtop prel name host user addr".split():
                             job[k] = cj.get(k) or ""
 
                         pdir = djoin(cj["ptop"], cj["prel"])
@@ -2801,7 +2801,7 @@ class Up2k(object):
                                     job["prel"] = rem
                                     bos.makedirs(pdir)
 
-                        job["name"] = self._untaken(pdir, cj, now)
+                        job["name"] = self._untaken(pdir, job, now)
 
                         if not self.args.nw:
                             dvf: dict[str, Any] = vfs.flags
diff --git a/scripts/docker/innvikler.sh b/scripts/docker/innvikler.sh
index 02ff9ce2..d16561c5 100644
--- a/scripts/docker/innvikler.sh
+++ b/scripts/docker/innvikler.sh
@@ -13,12 +13,6 @@ echo % /cfg > initcfg
 python3 copyparty-sfx.py --version
 cd /tmp/pe-copyparty.0
 
-# workaround s390x deadlock on startup
-[ $(uname -m) = s390x ] && cat >copyparty/stolen/ifaddr/_posix.py <<'EOF'
-def get_adapters(include_unconfigured=False):
-    return []
-EOF
-
 # steal the stuff we need
 mv copyparty partftpy ftp/* /usr/lib/python3.*/site-packages/