Don't add empty path to PYTHONPATH setting.

Fixes #31
openSUSE · Jun 2, 2020 · 503823c · 503823c
1 parent 48bd863
commit 503823c
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/macros/010-common-defs b/macros/010-common-defs
@@ -111,13 +111,21 @@
 
 %pytest(+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-=) %{lua:\
     local args = rpm.expand("%**"); \
-    local intro = "%{python_expand PYTHONPATH=$PYTHONPATH:%{buildroot}%{$python_sitelib} PYTHONDONTWRITEBYTECODE=1 "; \
+    local path = ""; \
+    if posix.getenv("PYTHONPATH") then \
+    path = path .. "$PYTHONPATH:"; \
+    end; \
+    local intro = "%{python_expand PYTHONPATH=" .. path .. "%{buildroot}%{$python_sitelib} PYTHONDONTWRITEBYTECODE=1 "; \
     intro = intro .. "pytest-%{$python_bin_suffix} --ignore=_build.python2 --ignore=_build.python3 --ignore=_build.pypy3 -v " \
     print(intro .. args .. "}") \
 }
 %pytest_arch(+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-=) %{lua:\
     local args = rpm.expand("%**"); \
-    local intro = "%{python_expand PYTHONPATH=$PYTHONPATH:%{buildroot}%{$python_sitearch} PYTHONDONTWRITEBYTECODE=1 "; \
+    local path = ""; \
+    if posix.getenv("PYTHONPATH") then \
+    path = path .. "$PYTHONPATH:"; \
+    end; \
+    local intro = "%{python_expand PYTHONPATH=" .. path .. "%{buildroot}%{$python_sitearch} PYTHONDONTWRITEBYTECODE=1 "; \
     intro = intro .. "pytest-%{$python_bin_suffix} --ignore=_build.python2 --ignore=_build.python3 --ignore=_build.pypy3 -v "; \
     print(intro .. args .. "}") \
 }