[Gpg4win-commits] r616 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-12-03 16:56:41 +0100 (Mon, 03 Dec 2007)
New Revision: 616

Modified:
   trunk/ChangeLog
   trunk/src/make-msi.guids
   trunk/src/make-msi.pl
Log:
2007-12-03  Marcus Brinkmann  <marcus at g10code.de>

	* src/make-msi.pl (dump_all2): Hard code level for hidden packages
	to 1.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-11-30 11:33:30 UTC (rev 615)
+++ trunk/ChangeLog	2007-12-03 15:56:41 UTC (rev 616)
@@ -1,3 +1,8 @@
+2007-12-03  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/make-msi.pl (dump_all2): Hard code level for hidden packages
+	to 1.
+
 2007-11-30  Marcus Brinkmann  <marcus at g10code.de>
 
 	* packages/packages.current: Update gpgex.

Modified: trunk/src/make-msi.guids
===================================================================
--- trunk/src/make-msi.guids	2007-11-30 11:33:30 UTC (rev 615)
+++ trunk/src/make-msi.guids	2007-12-03 15:56:41 UTC (rev 616)
@@ -4,6 +4,7 @@
 b3ce3cd9-0436-4348-8c09-106163ad9170 /PRODUCT/1.9.0.595
 e34a3f68-c604-4029-99dc-5c4822556934 /PRODUCT/1.9.0.600
 8806e4a6-c6e3-4b18-879b-2063206c46ef /PRODUCT/1.9.0.608
+f5898ebd-f30a-4cfc-9763-2a98befe6719 /PRODUCT/1.9.0.613
 fb54db39-2456-4fcc-9550-2790db663015 /REGISTRY/HKLM/Software\GNU\GnuPG/Install Directory
 ad23691b-1734-4dec-b91a-d4ff286190ea /REGISTRY/HKLM/Software\GNU\GnuPG/gpgProgram
 e0807a2f-4e70-48f8-b047-c5d3e219c3e7 /UPGRADE/1

Modified: trunk/src/make-msi.pl
===================================================================
--- trunk/src/make-msi.pl	2007-11-30 11:33:30 UTC (rev 615)
+++ trunk/src/make-msi.pl	2007-12-03 15:56:41 UTC (rev 616)
@@ -1316,10 +1316,13 @@
 	{
 	    my $deppkg = $parser->{pkgs}->{$dep};
 	    
+	    # We use Level=1 because with InstallDefault followParent
+	    # the Level seems to specify some sort of minimum install
+	    # level or something (FIXME: confirm this).
 	    print ' ' x $::level
 		. "  <Feature Id='p_$pkg->{name}_$dep' "
 		. "Title='p_$pkg->{name}_$dep' "
-		. "Level='$pkg->{level}' Display='hidden' "
+		. "Level='1' Display='hidden' "
 		. "InstallDefault='followParent'>\n";
 	    $::level += 2;
 	    dump_meat ($deppkg);