| 1 |
commit: 9b482adc47992eb2df830d906be57330acc89fa2 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 3 23:57:59 2015 +0000 |
| 4 |
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 7 20:48:38 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=9b482adc |
| 7 |
|
| 8 |
Move the plugin module into a portage namespace for installation |
| 9 |
|
| 10 |
But to avoid import conflicts during testing in the checkout, move it to a pm_plugins subdir. |
| 11 |
|
| 12 |
--- |
| 13 |
MANIFEST.in | 1 + |
| 14 |
pm_plugins/portage/__init__.py | 0 |
| 15 |
pm_plugins/portage/sync/__init__.py | 0 |
| 16 |
pm_plugins/portage/sync/modules/__init__.py | 0 |
| 17 |
.../portage/sync/modules/laymansync}/__init__.py | 4 ++-- |
| 18 |
.../portage/sync/modules/laymansync/laymansync.py | 0 |
| 19 |
setup.py | 3 ++- |
| 20 |
7 files changed, 5 insertions(+), 3 deletions(-) |
| 21 |
|
| 22 |
diff --git a/MANIFEST.in b/MANIFEST.in |
| 23 |
index df2a997..b8e8a30 100644 |
| 24 |
--- a/MANIFEST.in |
| 25 |
+++ b/MANIFEST.in |
| 26 |
@@ -12,3 +12,4 @@ include doc/layman.8 |
| 27 |
include doc/layman.8.html |
| 28 |
include doc/layman.8.txt |
| 29 |
recursive-include layman/tests * |
| 30 |
+recursive-include pm_plugins * |
| 31 |
|
| 32 |
diff --git a/pm_plugins/portage/__init__.py b/pm_plugins/portage/__init__.py |
| 33 |
new file mode 100644 |
| 34 |
index 0000000..e69de29 |
| 35 |
|
| 36 |
diff --git a/pm_plugins/portage/sync/__init__.py b/pm_plugins/portage/sync/__init__.py |
| 37 |
new file mode 100644 |
| 38 |
index 0000000..e69de29 |
| 39 |
|
| 40 |
diff --git a/pm_plugins/portage/sync/modules/__init__.py b/pm_plugins/portage/sync/modules/__init__.py |
| 41 |
new file mode 100644 |
| 42 |
index 0000000..e69de29 |
| 43 |
|
| 44 |
diff --git a/layman/laymanator/__init__.py b/pm_plugins/portage/sync/modules/laymansync/__init__.py |
| 45 |
similarity index 94% |
| 46 |
rename from layman/laymanator/__init__.py |
| 47 |
rename to pm_plugins/portage/sync/modules/laymansync/__init__.py |
| 48 |
index 890302c..de06b03 100644 |
| 49 |
--- a/layman/laymanator/__init__.py |
| 50 |
+++ b/pm_plugins/portage/sync/modules/laymansync/__init__.py |
| 51 |
@@ -19,11 +19,11 @@ except ImportError: |
| 52 |
|
| 53 |
|
| 54 |
module_spec = { |
| 55 |
- 'name': 'laymanator', |
| 56 |
+ 'name': 'laymansync', |
| 57 |
'description': __doc__, |
| 58 |
'provides':{ |
| 59 |
'layman-module': { |
| 60 |
- 'name': 'laymanator', |
| 61 |
+ 'name': 'laymansync', |
| 62 |
'class': config_class, |
| 63 |
'description': __doc__, |
| 64 |
'functions': ['sync', 'new', 'exists'], |
| 65 |
|
| 66 |
diff --git a/layman/laymanator/laymanator.py b/pm_plugins/portage/sync/modules/laymansync/laymansync.py |
| 67 |
similarity index 100% |
| 68 |
rename from layman/laymanator/laymanator.py |
| 69 |
rename to pm_plugins/portage/sync/modules/laymansync/laymansync.py |
| 70 |
|
| 71 |
diff --git a/setup.py b/setup.py |
| 72 |
index 8a815eb..21a387a 100755 |
| 73 |
--- a/setup.py |
| 74 |
+++ b/setup.py |
| 75 |
@@ -5,6 +5,7 @@ import sys |
| 76 |
|
| 77 |
from distutils.core import setup |
| 78 |
|
| 79 |
+ |
| 80 |
# this affects the names of all the directories we do stuff with |
| 81 |
sys.path.insert(0, './') |
| 82 |
from layman.version import VERSION |
| 83 |
@@ -27,7 +28,7 @@ SELECTABLE = { |
| 84 |
use_defaults = ' '.join(list(SELECTABLE)) |
| 85 |
|
| 86 |
SYNC_PLUGINS = { |
| 87 |
- 'sync-plugin-portage': 'layman.laymanator', |
| 88 |
+ 'sync-plugin-portage': 'portage.sync.modules.laymansync', |
| 89 |
} |
| 90 |
|
| 91 |
# get the USE from the environment, default to all selectable modules |
Archives