[Wigwam-cvs] wigwam-base/build-scripts check-for-system-package, 1.2, 1.3 update-packages2.in, 1.5, 1.6

[Dave B. <dav...@us...>]

Update of /cvsroot/wigwam/wigwam-base/build-scripts
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24876

Modified Files:
	check-for-system-package update-packages2.in 
Log Message:
support for WIGWAM_SYSTEM_PACKAGES


Index: check-for-system-package
===================================================================
RCS file: /cvsroot/wigwam/wigwam-base/build-scripts/check-for-system-package,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** check-for-system-package	6 Mar 2001 03:09:23 -0000	1.2
--- check-for-system-package	23 Oct 2007 17:35:36 -0000	1.3
***************
*** 21,25 ****
  
  # scan through the raw lists of system packages.
! for file in "$PLAYPEN_ROOT/etc/system-packages" \
              "$PLAYPEN_ROOT/etc/clusters/$PLAYPEN_CLUSTER/system-packages" \
              "$PLAYPEN_ROOT/etc/roles/$PLAYPEN_ROLE/system-packages" ; do
--- 21,26 ----
  
  # scan through the raw lists of system packages.
! for file in "$PLAYPEN_ROOT/etc/system-packages.local" \
!             "$PLAYPEN_ROOT/etc/system-packages" \
              "$PLAYPEN_ROOT/etc/clusters/$PLAYPEN_CLUSTER/system-packages" \
              "$PLAYPEN_ROOT/etc/roles/$PLAYPEN_ROLE/system-packages" ; do
***************
*** 38,41 ****
--- 39,47 ----
    }
  done
+ for sp in $WIGWAM_SYSTEM_PACKAGES ; do
+   if test "x$sp" = "x$package" ; then
+     exit 0
+   fi
+ done
  
  # (find the current role/cluster)

Index: update-packages2.in
===================================================================
RCS file: /cvsroot/wigwam/wigwam-base/build-scripts/update-packages2.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** update-packages2.in	23 Oct 2007 17:29:13 -0000	1.5
--- update-packages2.in	23 Oct 2007 17:35:36 -0000	1.6
***************
*** 143,148 ****
  }
  
! @system_packages_files = ( "$ENV{PLAYPEN_ROOT}/system-packages.local",
!                            "$ENV{PLAYPEN_ROOT}/system-packages" );
  for (@system_packages_files)
  {
--- 143,150 ----
  }
  
! # Handle system-packages, $WIGWAM_SYSTEM_PACKAGES.
! @system_packages_files = ( "$ENV{PLAYPEN_ROOT}/etc/system-packages.local",
!                            "$ENV{PLAYPEN_ROOT}/etc/system-packages" );
! %system_packages = ();
  for (@system_packages_files)
  {
***************
*** 151,161 ****
      while (<SP>) {
        next unless /^([a-zA-Z0-9\-_\.+]+)/;
!       if ((defined $ACTIONS{$1}) && ($ACTIONS{$1} ne 'UNINSTALL')) {
!         delete $ACTIONS{$1};
!       }
      }
      close SP;
    }
  }
  
  for (keys %ACTIONS) {
--- 153,171 ----
      while (<SP>) {
        next unless /^([a-zA-Z0-9\-_\.+]+)/;
!       $system_packages{$1} = 1;
      }
      close SP;
    }
  }
+ if (defined $ENV{'WIGWAM_SYSTEM_PACKAGES'}) {
+   for (split /\s+/, $ENV{'WIGWAM_SYSTEM_PACKAGES'}) {
+     $system_packages{$_} = 1
+   }
+ }
+ for (keys %system_packages) {
+   next unless defined $ACTIONS{$_};
+   next if $ACTIONS{$_} eq 'UNINSTALL';
+   delete $ACTIONS{$_};
+ }
  
  for (keys %ACTIONS) {