[Pkg-mono-svn-commits] rev 2596 - in cli-common/trunk: . debian

[Sebastian Dröge]

Author: slomo-guest
Date: 2006-07-04 18:52:49 +0000 (Tue, 04 Jul 2006)
New Revision: 2596

Modified:
   cli-common/trunk/debian/changelog
   cli-common/trunk/dh_installcligac
   cli-common/trunk/gac-package-install
Log:
* make dh_installcligac and gac-package-install a bit more sane


Modified: cli-common/trunk/debian/changelog
===================================================================
--- cli-common/trunk/debian/changelog	2006-07-04 18:37:31 UTC (rev 2595)
+++ cli-common/trunk/debian/changelog	2006-07-04 18:52:49 UTC (rev 2596)
@@ -2,6 +2,12 @@
 
   * Sebastian 'slomo' Dröge:
     + Fix file naming of the policy files in the CLI policy
+    + dh_installcligac:
+      - Do some sanity checking whether the files listed in the installcligac
+        files really exist. Otherwise fail.
+    + gac-package-install:
+      - Fail at install time if a file listed in the installcligac file does
+        not exist. (Closes: #366451)
 
  -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Wed, 28 Jun 2006 12:33:24 +0200
 

Modified: cli-common/trunk/dh_installcligac
===================================================================
--- cli-common/trunk/dh_installcligac	2006-07-04 18:37:31 UTC (rev 2595)
+++ cli-common/trunk/dh_installcligac	2006-07-04 18:52:49 UTC (rev 2596)
@@ -51,6 +51,18 @@
 	my $cligac = pkgfile($package, "installcligac");
 
 	if ($cligac ne '') {
+		# sanity check: do all files listed in the installcligac file exist?
+		open CLIGAC, "<$cligac" or
+			die "E: Can't open $cligac\n";
+		while (<CLIGAC>)
+		{
+			chomp;
+			if (! -f "$tmp$_") {
+				die "E: Can't find file $tmp$_!\n";
+			}
+		}
+		close CLIGAC;
+
 		if (! -d "$tmp/usr/share/cli-common/packages.d") {
 			doit("install","-d","$tmp/usr/share/cli-common/packages.d");
 		}

Modified: cli-common/trunk/gac-package-install
===================================================================
--- cli-common/trunk/gac-package-install	2006-07-04 18:37:31 UTC (rev 2595)
+++ cli-common/trunk/gac-package-install	2006-07-04 18:52:49 UTC (rev 2596)
@@ -61,7 +61,7 @@
     if (! -f $dll)
     {
 	print STDERR "! Assembly $dll does not exist, ignoring\n";
-	next;
+	exit 3;
     }
 
     push @dlls, $dll;