Skip to content

Commit 1fa283a

Browse files
committed
Fix internal modules being synced as external ones
1 parent a38564a commit 1fa283a

2 files changed

Lines changed: 5 additions & 0 deletions

File tree

changelog/69199.fixed.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixed Salt-SSH syncing internal modules as extmods

salt/client/ssh/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,6 +1742,10 @@ def mod_data(fsclient):
17421742
if not os.path.isdir(mod_dir):
17431743
continue
17441744

1745+
# Skip internal salt modules - they should be in the thin/relenv tarball
1746+
if mod_dir.startswith(str(salt.loader.SALT_BASE_PATH)):
1747+
continue
1748+
17451749
for fn_ in os.listdir(mod_dir):
17461750
if fn_.endswith((".py", ".so", ".pyx")) and not fn_.startswith(
17471751
"__"

0 commit comments

Comments
 (0)