From 6b8263272303336dce2cf607b4ab059418c3d1f5 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz@pobox.com>
Date: Feb 05 2024 23:44:03 +0000
Subject: mockbuild: use results/mock_* when results_dir=subdir


When results_dir=subdir most output and artifacts are stored under the
results directory.  Move the mock results dir from results_$pkgname to
avoid an extra, unnecessary top-level directory.

Signed-off-by: Todd Zullinger <tmz@pobox.com>

---

diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
index 4c56169..875dea3 100644
--- a/pyrpkg/__init__.py
+++ b/pyrpkg/__init__.py
@@ -1169,8 +1169,11 @@ class Commands(object):
 
     @property
     def mock_results_dir(self):
-        return os.path.join(self.path, "results_%s" % self.repo_name,
-                            self.ver, self.rel)
+        if self.results_dir == 'subdir':
+            results_dir = "results/mock_%s" % self.repo_name
+        else:
+            results_dir = "results_%s" % self.repo_name
+        return os.path.join(self.path, results_dir, self.ver, self.rel)
 
     @property
     def sources_filename(self):