add a helper function to remove vendored libraries

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>

diff --git a/vendor.py b/vendor.py
index f10ee0006d399e53329c61141ba9889c257f6ee0..33d89064e99fe79f5defaa53c41cfa4dfbd957ce 100644 (file)
--- a/vendor.py
+++ b/vendor.py
@@ -3,6 +3,7 @@ import os
 from os import path
 import traceback
 import sys
+import shutil
 
 
 error_msg = """
@@ -43,7 +44,7 @@ def print_error(stdout, stderr):
 
 def vendor_library(name, version):
     this_dir = path.dirname(path.abspath(__file__))
-    vendor_dest = path.join(this_dir, 'ceph_deploy/lib/%s' % name)
+    vendor_dest = path.join(this_dir, 'ceph_deploy/lib/vendor/%s' % name)
     vendor_src = path.join(this_dir, name)
     vendor_module = path.join(vendor_src, name)
     current_dir = os.getcwd()
@@ -52,7 +53,7 @@ def vendor_library(name, version):
         run(['rm', '-rf', vendor_src])
 
     if path.exists(vendor_dest):
-        module = __import__('ceph_deploy.lib.remoto', globals(), locals(), ['__version__'])
+        module = __import__('ceph_deploy.lib.vendor.remoto', globals(), locals(), ['__version__'])
         if module.__version__ != version:
             run(['rm', '-rf', vendor_dest])
 
@@ -64,6 +65,16 @@ def vendor_library(name, version):
     os.chdir(current_dir)
 
 
+def clean_vendor(name):
+    """
+    Ensure that vendored code/dirs are removed, possibly when packaging when
+    the environment flag is set to avoid vendoring.
+    """
+    this_dir = path.dirname(path.abspath(__file__))
+    vendor_dest = path.join(this_dir, 'ceph_deploy/lib/vendor/%s' % name)
+    run(['rm', '-rf', vendor_dest])
+
+
 def vendorize(vendor_requirements):
     """
     This is the main entry point for vendorizing requirements. It expects