ominfra 0.0.0.dev261__py3-none-any.whl → 0.0.0.dev263__py3-none-any.whl

ominfra/pyremote.py

@@ -93,7 +93,11 @@ class PyremoteEnvInfo:
 
     pw: Pw
 
-    env_path: ta.Optional[str]
+    @dc.dataclass(frozen=True)
+    class Env:
+        path: ta.Optional[str]
+
+    env: Env
 
     #
 
@@ -172,7 +176,9 @@ def _get_pyremote_env_info() -> PyremoteEnvInfo:
             shell=pw.pw_shell,
         ),
 
-        env_path=os.environ.get('PATH'),
+        env=PyremoteEnvInfo.Env(
+            path=os.environ.get('PATH'),
+        ),
     )
 
 

ominfra/scripts/journald2aws.py

@@ -16,6 +16,7 @@ import dataclasses as dc
 import datetime
 import decimal
 import enum
+import errno
 import fcntl
 import fractions
 import functools
@@ -2008,6 +2009,7 @@ class Pidfile:
         if hasattr(self, '_fd_to_dup'):
             fd = os.dup(self._fd_to_dup)
             del self._fd_to_dup
+
         else:
             ofl = os.O_RDWR
             if not self._no_create:
@@ -2020,11 +2022,8 @@ class Pidfile:
 
             f = os.fdopen(fd, 'r+')
 
-        except Exception:
-            try:
-                os.close(fd)
-            except Exception:  # noqa
-                pass
+        except BaseException:
+            os.close(fd)
             raise
 
         self._f = f
@@ -2069,8 +2068,11 @@ class Pidfile:
             fcntl.flock(self._f, fcntl.LOCK_EX | fcntl.LOCK_NB)
             return True
 
-        except OSError:
-            return False
+        except BlockingIOError as e:
+            if e.errno == errno.EAGAIN:
+                return False
+            else:
+                raise
 
     #
 

ominfra/scripts/manage.py

@@ -755,7 +755,11 @@ class PyremoteEnvInfo:
 
     pw: Pw
 
-    env_path: ta.Optional[str]
+    @dc.dataclass(frozen=True)
+    class Env:
+        path: ta.Optional[str]
+
+    env: Env
 
     #
 
@@ -834,7 +838,9 @@ def _get_pyremote_env_info() -> PyremoteEnvInfo:
             shell=pw.pw_shell,
         ),
 
-        env_path=os.environ.get('PATH'),
+        env=PyremoteEnvInfo.Env(
+            path=os.environ.get('PATH'),
+        ),
     )
 
 
@@ -4084,6 +4090,9 @@ def relative_symlink(
 # ../../../omlish/shlex.py
 
 
+##
+
+
 def shlex_needs_quote(s: str) -> bool:
     return bool(s) and len(list(shlex.shlex(s))) > 1
 
@@ -7856,6 +7865,9 @@ class SubprocessRunnable(abc.ABC, ta.Generic[T]):
 # ../../../omlish/text/indent.py
 
 
+##
+
+
 class IndentWriter:
     DEFAULT_INDENT = ' ' * 4
 

{ominfra-0.0.0.dev261.dist-info → ominfra-0.0.0.dev263.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev261
+Version: 0.0.0.dev263
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev261
-Requires-Dist: omlish==0.0.0.dev261
+Requires-Dist: omdev==0.0.0.dev263
+Requires-Dist: omlish==0.0.0.dev263
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev261.dist-info → ominfra-0.0.0.dev263.dist-info}/RECORD

@@ -1,7 +1,7 @@
 ominfra/.manifests.json,sha256=8KREXxMAlsilZOktXPYru1ND3V5hFI22vnrp6hT3bio,589
 ominfra/__about__.py,sha256=6i1AoruFYQCd-PyhhbDQDWY2d1tiQu9nkwWr-fXAqfY,705
 ominfra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/pyremote.py,sha256=I8775ohUGn1DsI-6NQFAV2hxa6TPsH4ksINHxeIEw0w,16228
+ominfra/pyremote.py,sha256=mxl-2K1f2gEFB4upn1pK2Zpy6ZZ9rLs2Uklj9HluktY,16332
 ominfra/systemd.py,sha256=d61NVrJoItzSaqhMDgKGrQjbrxEVAujUMDsj8WggXos,1022
 ominfra/threadworkers.py,sha256=ADWHAdvjzPxm94yJcEt5_nM7q7aahdQUNP_EGQeOWAw,4974
 ominfra/clouds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -112,8 +112,8 @@ ominfra/manage/targets/connection.py,sha256=rVI1YJxFClcF-sdttqWyIz9_XjPI01GUdwxY
 ominfra/manage/targets/inject.py,sha256=P4597xWM-V3I_gCt2O71OLhYQkkXtuJvkYRsIbhhMcE,1561
 ominfra/manage/targets/targets.py,sha256=7GP6UAZyJFEhpkJN6UQdpr_WN3p7C76v-s445y-WB6U,1885
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/scripts/journald2aws.py,sha256=ZX6qEsLVJSnRm22Mm8-euNG4zCqdMdFPz31pb9RsBOg,168504
-ominfra/scripts/manage.py,sha256=5RjcKg2gGf5N8NEgbTSpvJT6deRM46vetC3Vn0i92u8,379538
+ominfra/scripts/journald2aws.py,sha256=l5_grHu-HtPtZFxGplKJSOO6rh1Np8WpgITh3yqv_Mo,168539
+ominfra/scripts/manage.py,sha256=dN8Wf8dt8uATsH9CkdaugVXp-rFKKFj5nb8WNfrCthM,379652
 ominfra/scripts/supervisor.py,sha256=lv_bv0d15GUsrUN44KaN0n4_NJHhrN66BSsO2swcY7U,297117
 ominfra/supervisor/LICENSE.txt,sha256=ZrHY15PVR98y26Yg6iQfa-SXnUaYTDhrUsPVcEO5OKM,1874
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -156,9 +156,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=3FnJbgpLw6gInTfhERd1mDy9ijjMUGxkdYVo43Tnxx4,3555
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=auGP1LlbBJSFKUWNvQo_UzA8IsBNZBTMwEkFFRJ4FX4,6185
-ominfra-0.0.0.dev261.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev261.dist-info/METADATA,sha256=uplU1HwWcuSup_BHqs4KGky6-TAcnSbfm7nouSp8ub8,753
-ominfra-0.0.0.dev261.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-ominfra-0.0.0.dev261.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev261.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev261.dist-info/RECORD,,
+ominfra-0.0.0.dev263.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev263.dist-info/METADATA,sha256=-CrtiJdUtOf1lukbLi6eYR8JeWcj2G14KAw5qJETn4g,753
+ominfra-0.0.0.dev263.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+ominfra-0.0.0.dev263.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev263.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev263.dist-info/RECORD,,

{ominfra-0.0.0.dev261.dist-info → ominfra-0.0.0.dev263.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.3)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any