Merging upstream version 1.3.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
f0916a610f
commit
29882c9a9e
28 changed files with 75 additions and 83 deletions
4
ztest.cc
4
ztest.cc
|
@ -1,5 +1,5 @@
|
|||
/* Ztest - verify integrity of compressed files
|
||||
Copyright (C) 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
|
||||
Copyright (C) 2010-2014 Antonio Diaz Diaz.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
@ -164,7 +164,7 @@ int ztest_file( const int infd, int format_index,
|
|||
{
|
||||
if( disable_xz < 0 )
|
||||
{
|
||||
std::string command( compressor_name ); command += " -V > /dev/null";
|
||||
std::string command( compressor_name ); command += " -V > /dev/null 2>&1";
|
||||
disable_xz = ( std::system( command.c_str() ) != 0 );
|
||||
}
|
||||
if( disable_xz ) return 0; // ignore this file if no xz installed
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue