retrieve installed packages from envvar: $ZIMBRA_INSTALLED_PKGS

2a9073fd · Marco Mariani · 3b024be8 · 2a9073fd
Commit 2a9073fd authored May 07, 2013 by Marco Mariani
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

ZimbraBuild/rpmconf/Install/zmsetup.pl ZimbraBuild/rpmconf/Install/zmsetup.pl +7 -4

No files found.
--- a/ZimbraBuild/rpmconf/Install/zmsetup.pl
+++ b/ZimbraBuild/rpmconf/Install/zmsetup.pl
@@ -607,10 +607,13 @@ sub isEnabled {
 sub isInstalled {
  my $pkg = shift;

-  # XXX SLAPOS hardcode the installed packages.
-  if ($pkg eq "zimbra-store" || $pkg eq "zimbra-core") {
+  if (exists $ENV{'ZIMBRA_INSTALLED_PKGS'}) {
+    for my $p ( split(/ /, $ENV{'ZIMBRA_INSTALLED_PKGS'}) ) {
+      if ($p eq $pkg) {
        return 1;
-  }
+      };
+    };
+  };

  my $pkgQuery;