lockss-turtles 0.5.0.dev2__tar.gz → 0.5.0.dev4__tar.gz

{lockss_turtles-0.5.0.dev2 → lockss_turtles-0.5.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lockss-turtles
-Version: 0.5.0.dev2
+Version: 0.5.0.dev4
 Summary: Tool to manage LOCKSS plugin sets and LOCKSS plugin registries
 Home-page: https://www.lockss.org/
 License: BSD-3-Clause

{lockss_turtles-0.5.0.dev2 → lockss_turtles-0.5.0.dev4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "lockss-turtles"
-version = "0.5.0-dev2"
+version = "0.5.0-dev4"
 description = "Tool to manage LOCKSS plugin sets and LOCKSS plugin registries"
 license = "BSD-3-Clause"
 authors = [

{lockss_turtles-0.5.0.dev2 → lockss_turtles-0.5.0.dev4}/src/lockss/turtles/__init__.py

@@ -28,7 +28,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-__version__ = '0.5.0-dev2'
+__version__ = '0.5.0-dev4'
 
 __copyright__ = '''
 Copyright (c) 2000-2023, Board of Trustees of Leland Stanford Jr. University

{lockss_turtles-0.5.0.dev2 → lockss_turtles-0.5.0.dev4}/src/lockss/turtles/plugin_set.py

@@ -160,11 +160,13 @@ class AntPluginSet(PluginSet):
 
     # Returns (jar_path, plugin)
     def _little_build(self, plugin_id, keystore_path, keystore_alias, keystore_password=None):
+        orig_plugin = None
         cur_id = plugin_id
         # Get all directories for jarplugin -d
         dirs = list()
         while cur_id is not None:
             cur_plugin = self.make_plugin(cur_id)
+            orig_plugin = orig_plugin or cur_plugin
             cur_dir = Plugin.id_to_dir(cur_id)
             if cur_dir not in dirs:
                 dirs.append(cur_dir)
@@ -196,7 +198,7 @@ class AntPluginSet(PluginSet):
             raise self._sanitize(cpe)
         if not jar_path.is_file():
             raise FileNotFoundError(str(jar_path))
-        return (jar_path, plugin)
+        return (jar_path, orig_plugin)
 
     def _plugin_path(self, plugin_id):
         return Path(self.get_main_path()).joinpath(Plugin.id_to_file(plugin_id))