[MDEP-651] Warn on duplicate archive entries

mthmulders · mthmulders · commit 52a9a1f4aa61 · 2019-11-07T17:06:17.000+01:00
If there's an file system entry for the archive entry, a warning is
logged. If overwrite is false, extraction is aborted.
diff --git a/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java
@@ -343,9 +343,13 @@ protected void extractFile( final File srcF, final File dir, final InputStream c
 
         try
         {
-            if ( !isOverwrite() && f.exists() && ( f.lastModified() >= entryDate.getTime() ) )
+            if ( f.exists() && ( f.lastModified() >= entryDate.getTime() ) )
             {
-                return;
+                String message = String.format( "Archive entry %s already exists on disk and is newer", entryName );
+                getLogger().warn( message );
+                if ( !isOverwrite() ) {
+                    return;
+                }
             }
 
             // create intermediary directories - sometimes zip don't add them

Original file line number	Diff line number	Diff line change
`@@ -343,9 +343,13 @@ protected void extractFile( final File srcF, final File dir, final InputStream c`
`343`	`343`
`344`	`344`	`try`
`345`	`345`	`{`
`346`		`- if ( !isOverwrite() && f.exists() && ( f.lastModified() >= entryDate.getTime() ) )`
	`346`	`+ if ( f.exists() && ( f.lastModified() >= entryDate.getTime() ) )`
`347`	`347`	`{`
`348`		`- return;`
	`348`	`+ String message = String.format( "Archive entry %s already exists on disk and is newer", entryName );`
	`349`	`+ getLogger().warn( message );`
	`350`	`+ if ( !isOverwrite() ) {`
	`351`	`+ return;`
	`352`	`+ }`
`349`	`353`	`}`
`350`	`354`
`351`	`355`	`// create intermediary directories - sometimes zip don't add them`