[Pkg-owncloud-commits] [owncloud] 136/258: Previous commit was not based on master, retry. Removed broken tar cutter, double extensions are not possible in temp files. Added tar support. Fixed extension switch.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit fbcd80ac083ca595d944564cab604405445b5571
Author: Remco Brenninkmeijer <requist1 at starmail.nl>
Date:   Mon Aug 4 14:10:09 2014 +0200

    Previous commit was not based on master, retry. Removed broken tar cutter, double extensions are not possible in temp files. Added tar support. Fixed extension switch.
---
 lib/private/archive.php     |  5 +----
 lib/private/archive/tar.php | 10 ++++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/private/archive.php b/lib/private/archive.php
index a62f22c..562172d 100644
--- a/lib/private/archive.php
+++ b/lib/private/archive.php
@@ -20,11 +20,8 @@ abstract class OC_Archive{
 			case '.gz':
 			case '.bz':
 			case '.bz2':
-				if(strpos($path, '.tar.')) {
-					return new OC_Archive_TAR($path);
-				}
-				break;
 			case '.tgz':
+			case '.tar':
 				return new OC_Archive_TAR($path);
 		}
 	}
diff --git a/lib/private/archive/tar.php b/lib/private/archive/tar.php
index 21a995d..3f64b4c 100644
--- a/lib/private/archive/tar.php
+++ b/lib/private/archive/tar.php
@@ -40,12 +40,14 @@ class OC_Archive_TAR extends OC_Archive{
 		if(strpos($file, '.')) {
 			$extension=substr($file, strrpos($file, '.'));
 			switch($extension) {
-				case 'gz':
-				case 'tgz':
+				case '.gz':
+				case '.tgz':
 					return self::GZIP;
-				case 'bz':
-				case 'bz2':
+				case '.bz':
+				case '.bz2':
 					return self::BZIP;
+				case '.tar':
+					return self::PLAIN;
 				default:
 					return self::PLAIN;
 			}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git