Change to exporting under 'rtslib' and 'rtslib_fb" pkg names

We should move off of 'rtslib' because we are incompatible with the
original package using this name. Export as 'rtslib_fb', and add a
warning to switch to importing by the new package name if using the old
import name.

Signed-off-by: Andy Grover <agrover@redhat.com>

3 files changed, 8 insertions, 2 deletions

diff --git a/rtslib/__init__.py b/rtslib/__init__.py
index 72d3067..5b6dfd6 100644
--- a/rtslib/__init__.py
+++ b/rtslib/__init__.py
@@ -16,6 +16,11 @@ License for the specific language governing permissions and limitations
 under the License.
 '''
 
+if __name__ == "rtslib":
+    from warnings import warn
+    warn("'rtslib' package name for rtslib-fb is deprecated, please"
+         + " instead import 'rtslib_fb'", UserWarning, stacklevel=2)
+
 from root import RTSRoot
 from utils import RTSLibError, RTSLibBrokenLink, RTSLibNotInCFS
 
diff --git a/scripts/targetctl b/scripts/targetctl
index cc4eb99..9d02b91 100755
--- a/scripts/targetctl
+++ b/scripts/targetctl
@@ -24,7 +24,7 @@ under the License.
 
 from __future__ import print_function
 
-from rtslib import RTSRoot
+from rtslib_fb import RTSRoot
 import os
 import sys
 
diff --git a/setup.py b/setup.py
index 4fed0e8..87cbf9b 100755
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,8 @@ setup (
     maintainer = 'Andy Grover',
     maintainer_email = 'agrover@redhat.com',
     url = 'http://github.com/agrover/rtslib-fb',
-    packages = ['rtslib'],
+    packages = ['rtslib_fb', 'rtslib'],
+    package_dir = {'rtslib_fb': 'rtslib'},
     scripts = ['scripts/targetctl'],
     use_2to3 = True,
     )