temp commit

Author: dralley

src/python/createrepo_c/__init__.py

@@ -332,21 +332,28 @@ def decompress_file(src, dst, comtype, stat=None):
 compression_type    = _createrepo_c.compression_type
 
 
-DATA = os.path.join(os.path.dirname(__file__), 'data')
-
-# Support running tests from the source tree
-if not os.path.exists(DATA):
-    from skbuild.constants import CMAKE_INSTALL_DIR as SKBUILD_CMAKE_INSTALL_DIR
-    _data = os.path.abspath(os.path.join(
-        os.path.dirname(__file__), '..', SKBUILD_CMAKE_INSTALL_DIR, 'src/python/data'))
-    if os.path.exists(_data):
-        DATA = _data
-
-BIN_DIR = os.path.join(DATA, 'bin')
-
+_SKBUILD = bool("@SKBUILD@")  # Replaced by CMake
+
+if _SKBUILD:
+    # If we have been built as a Python package, e.g. "setup.py" or "pip install -e"
+    _DATA = os.path.join(os.path.dirname(__file__), 'data')
+
+    # Support running tests from the source tree
+    if not os.path.exists(_DATA):
+        from skbuild.constants import CMAKE_INSTALL_DIR as SKBUILD_CMAKE_INSTALL_DIR
+        _data = os.path.abspath(os.path.join(
+            os.path.dirname(__file__), '..', SKBUILD_CMAKE_INSTALL_DIR, 'src/python/data'))
+        if os.path.exists(_data):
+            DATA = _data
+
+    _BIN_DIR = os.path.join(DATA, 'bin')
+else:
+    # If we were not built as a Python package, e.g. RPM, "cmake ..; make"
+    # Just assume that the binary will be on the PATH somewhere, likely /usr/bin/
+    _BIN_DIR = ""
 
 def _program(name, args):
-    return subprocess.call([os.path.join(BIN_DIR, name)] + args)
+    return subprocess.call([os.path.join(_BIN_DIR, name)] + args)
 
 
 def createrepo_c():