Move salt patches out of qubes module

QubesOS/qubes-issues#1813
marmarek · May 21, 2017 · b45f4cf · b45f4cf
1 parent 3efd3ba
commit b45f4cf
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/rpm_spec/qubes-mgmt-salt-base-overrides.spec b/rpm_spec/qubes-mgmt-salt-base-overrides.spec
@@ -58,7 +58,7 @@ rm -rf build/ *.pyc *.pyo *.o *.a *~
 /srv/salt/_modules/localemod.py*
 
 %files libs
-%{python_sitelib}/qubes/*
-%{python_sitelib}/qubes.mgmt*-*-py?.?.egg-info
+%{python_sitelib}/qubessaltpatches/*
+%{python_sitelib}/qubessaltpatches*-*-py?.?.egg-info
 
 %changelog
diff --git a/setup.py b/setup.py
@@ -2,12 +2,12 @@
 
 from distutils.core import setup
 
-setup(name               = 'qubes.mgmt.patches',
+setup(name               = 'qubessaltpatches',
       version            = '1.0',
       author             = 'Jason Mehring',
       author_email       = '[email protected]',
       url                = 'https://github.com/nrgaway/qubes-mgmt-salt-base-overrides',
-      packages           = ['qubes', 'qubes.mgmt', 'qubes.mgmt.patches'],
+      packages           = ['qubessaltpatches'],
       package_dir        = {'': 'src'},
       license            ='LICENSE',
       description        = 'Custom modules to override existing Salt modules ' \

diff --git a/src/qubes/mgmt/__init__.py b/src/qubes/mgmt/__init__.py
diff --git a/src/qubes/mgmt/patches/__init__.py → src/qubessaltpatches/__init__.py b/src/qubes/mgmt/patches/__init__.py → src/qubessaltpatches/__init__.py
@@ -5,14 +5,14 @@
 # 
 # Add list merging within dictupdate
 if version.info < (2015, 8, 0, 0):
-    import qubes.mgmt.patches.update
+    import qubessaltpatches.update
 
 # Apply monkey patch for salt versions less than 2015.5.5
 #
 # Adds url module which appears in v2015.5.5
 if version.info < (2015, 5, 5, 0):
     import sys
-    import qubes.mgmt.patches.url
+    import qubessaltpatches.url
     url = sys.modules['qubes.mgmt.patches.url']
     sys.modules['salt.utils.url'] = url
 

diff --git a/src/qubes/mgmt/patches/update.py → src/qubessaltpatches/update.py b/src/qubes/mgmt/patches/update.py → src/qubessaltpatches/update.py
diff --git a/src/qubes/mgmt/patches/url.py → src/qubessaltpatches/url.py b/src/qubes/mgmt/patches/url.py → src/qubessaltpatches/url.py