components/quilt/patches/04-import2-zcat.patch
author jenny.yung@oracle.com <jenny.yung@oracle.com>
Tue, 16 Jun 2015 10:14:56 -0700
branchs11-update
changeset 4489 2713cbca9e1e
parent 327 b3a36ee93012
permissions -rw-r--r--
21240304 Upgrade OpenSSL version to 1.0.1o 21240457 problem in LIBRARY/OPENSSL 21240446 problem in LIBRARY/OPENSSL 21240467 problem in LIBRARY/OPENSSL 21240436 problem in LIBRARY/OPENSSL 21240415 problem in LIBRARY/OPENSSL 21240488 problem in LIBRARY/OPENSSL

From:    Dean Roehrich <[email protected]>
Subject: [Quilt-dev] [patch] use gzip rather than zcat in test/import2.test
Date:    Wed, 05 Nov 2008 19:34:14 CST
To:      [email protected]

The tests expect zcat to understand the .gz suffix, but in the Solaris
environment the zcat is not GNU and it expects a .Z suffix.  This modifies
the test to use gzip -dc, instead.

Dean


Index: test/import2.test
===================================================================
--- test/import2.test.orig	2008-11-05 20:00:39.305395000 -0600
+++ test/import2.test	2008-11-05 20:01:03.827736000 -0600
@@ -90,7 +90,7 @@
 	> Replacing patch %{P}patch1.diff.gz with new version
 
 	# an import requiring a description merge
-	$ zcat patches/patch1.diff.gz | sed -e 's/original/new/' | gzip > t/patch1.diff.gz
+	$ gzip -dc patches/patch1.diff.gz | sed -e 's/original/new/' | gzip > t/patch1.diff.gz
 	$ quilt import t/patch1.diff.gz
 	> Patch %{P}patch1.diff.gz exists. Replace with -f.
 
@@ -105,7 +105,7 @@
 	> Replacing patch %{P}patch1.diff.gz with new version
 
 	# quilt header does not work in this case because it stops at '---'
-	$ zcat patches/patch1.diff.gz | head -n 3
+	$ gzip -dc patches/patch1.diff.gz | head -n 3
 	> original description
 	> ---
 	> new description