rpms/plexus-archiver
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase patch

Browse Source
This commit is contained in:
Mikolaj Izdebski 2019-05-13 21:29:56 +02:00
parent 56095d00e3
commit 2c67123f1e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
0001-Remove-support-for-snappy.patch
View File

@ -1,15 +1,15 @@
From bd1055a190a1a64374f4aeb3bfde138d9c3d965f Mon Sep 17 00:00:00 2001 From 6e2004d90deab2f59af01629187006e320444e34 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com> From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sat, 23 Sep 2017 11:43:45 +0200 Date: Sat, 23 Sep 2017 11:43:45 +0200
Subject: [PATCH] Remove support for snappy Subject: [PATCH] Remove support for snappy
--- ---
src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java | 3 +-- .../java/org/codehaus/plexus/archiver/tar/TarArchiver.java | 3 +--
src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java | 3 +-- .../java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-) 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
index 398ecf1..0d46cfc 100644 index 8eec881..be8e7a3 100644
--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
+++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
@@ -38,7 +38,6 @@ @@ -38,7 +38,6 @@
@ -30,18 +30,18 @@ index 398ecf1..0d46cfc 100644
else if ( TarCompressionMethod.xz.equals( tarCompressionMethod ) ) else if ( TarCompressionMethod.xz.equals( tarCompressionMethod ) )
{ {
diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
index 4bc94a4..15f0494 100644 index 2316d4e..c2e2b83 100644
--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
+++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
@@ -30,7 +30,6 @@ @@ -31,7 +31,6 @@
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.util.Streams; import org.codehaus.plexus.archiver.util.Streams;
import org.codehaus.plexus.components.io.filemappers.FileMapper;
import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.IOUtil;
-import org.iq80.snappy.SnappyInputStream; -import org.iq80.snappy.SnappyInputStream;
/** /**
* @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a> * @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a>
@@ -153,7 +152,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 ) @@ -154,7 +153,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 )
} }
else if ( compression == UntarCompressionMethod.SNAPPY ) else if ( compression == UntarCompressionMethod.SNAPPY )
{ {
@ -51,5 +51,5 @@ index 4bc94a4..15f0494 100644
else if ( compression == UntarCompressionMethod.XZ ) else if ( compression == UntarCompressionMethod.XZ )
{ {
-- --
2.13.5 2.21.0