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
|
@ -206,7 +206,7 @@ int zupdate_file( const std::string & name, const char * const lzip_name,
|
|||
{
|
||||
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