Item13062: Multiple configure ext. installer issues

- Delete the "repository" from args hash - collision with package options - Pass $reporter to LoadSpec::parse - Don't depend on Configure::Util There are still issues - command line installer doesn't have a default repository to search.
foswiki · Nov 2, 2014 · fff12e5 · fff12e5
1 parent ca42192
commit fff12e5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/core/lib/Foswiki/Configure/Package.pm b/core/lib/Foswiki/Configure/Package.pm
@@ -889,7 +889,7 @@ sub _install {
 
         # Pick up all Config.spec's
         if ( $file =~ /\/Config.spec$/ ) {
-            Foswiki::Configure::LoadSpec::parse( $target, $spec );
+            Foswiki::Configure::LoadSpec::parse( $target, $spec, $reporter );
         }
         $reporter->NOTE("> ${simulated}Installed:  $file as $target");
     }

diff --git a/core/lib/Foswiki/Configure/Wizards/InstallExtensions.pm b/core/lib/Foswiki/Configure/Wizards/InstallExtensions.pm
@@ -78,6 +78,8 @@ sub _getPackage {
             return undef;
         }
     }
+    delete $args->{repository};
+
     my $pkg = Foswiki::Configure::Package->new(
         root       => $installRoot,
         repository => $repository,

diff --git a/core/tools/extender.pl b/core/tools/extender.pl
@@ -174,7 +174,6 @@ sub _stop {
 
 # Can't do this until we have setlib.cfg
 require Foswiki::Configure::Dependency;
-require Foswiki::Configure::Util;
 require Foswiki::Configure::Package;
 require Foswiki::Configure::Reporter;