From: paravoid <paravoid@19660600-52fe-0310-9875-adc0d7a7b53c>
Date: Tue, 2 Oct 2007 21:32:51 +0000 (+0000)
Subject: Move NTFS to the bottom since it's generating corrupted archives and is noisy
X-Git-Tag: 0.2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7dde50b7d9b662954c8462a71dbca5664dcddc74;p=tools%2Fpristine-tar.git

Move NTFS to the bottom since it's generating corrupted archives and is noisy
---

diff --git a/pristine-gz b/pristine-gz
index d754b0d..35b35c8 100755
--- a/pristine-gz
+++ b/pristine-gz
@@ -268,12 +268,6 @@ sub reproducegz {
 		$new = "$name.gz";
 	}
 
-	# Windows' NTFS gzip implementation; quirk is really really evil
-	if ($os == GZIP_OS_NTFS) {
-		testvariant($orig, $new, $name, @args, '--quirk', 'ntfs')
-			&& return $name, $timestamp, @args, '--quirk', 'ntfs';
-	}
-
 	# set the Operating System flag to the one found in the original
 	# archive
 	push @args, ("--osflag", $os) if $os != GZIP_OS_UNIX;
@@ -292,6 +286,14 @@ sub reproducegz {
 	testvariant($orig, $new, $name, @args, '--quirk', 'buggy-bsd')
 		&& return $name. $timestamp, @args, '--quirk', 'buggy-bsd';
 
+	# Windows' NTFS gzip implementation; quirk is really really evil
+	# it should be the last test: it can result in a corrupted archive!
+	if ($os == GZIP_OS_NTFS) {
+		pop @args; pop @args; # ntfs quirk implies NTFS osflag
+		testvariant($orig, $new, $name, @args, '--quirk', 'ntfs')
+			&& return $name, $timestamp, @args, '--quirk', 'ntfs';
+	}
+
 	print STDERR "pristine-gz failed to reproduce build of $orig\n";
 	print STDERR "(Please file a bug report.)\n";
 	exit 1;