fix s390x w/a, up2k name-randomizer

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":

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

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/