[Fai-commit] r6002 - in branches/stable/3.4: bin debian man

Michael Prokop mika at alioth.debian.org
Tue Aug 17 12:55:39 UTC 2010


Author: mika
Date: 2010-08-17 12:55:38 +0000 (Tue, 17 Aug 2010)
New Revision: 6002

Modified:
   branches/stable/3.4/bin/ftar
   branches/stable/3.4/debian/changelog
   branches/stable/3.4/man/ftar.8
Log:
ftar, ftar.8: add xz support


Conflicts:

	debian/changelog

Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/bin/ftar
===================================================================
--- branches/stable/3.4/bin/ftar	2010-08-17 12:55:34 UTC (rev 6001)
+++ branches/stable/3.4/bin/ftar	2010-08-17 12:55:38 UTC (rev 6002)
@@ -6,7 +6,7 @@
 # ftar -- extract tar files using FAI classes
 #
 # This script is part of FAI (Fully Automatic Installation)
-# Copyright (C) 2001-2009 Thomas Lange, lange at informatik.uni-koeln.de
+# Copyright (C) 2001-2010 Thomas Lange, lange at informatik.uni-koeln.de
 # Universitaet zu Koeln
 #
 #*********************************************************************
@@ -27,7 +27,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 #*********************************************************************
 
-version="Version 1.7, 25-september-2009"
+version="Version 1.7, 26-july-2010"
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 die() {
@@ -52,7 +52,7 @@
     cat <<EOF
 ftar, extract tar files using classes. $version
 
-   Copyright (C) 2001-2009 by Thomas Lange
+   Copyright (C) 2001-2010 by Thomas Lange
 
 Usage: ftar [OPTION] ... SOURCE
 
@@ -66,7 +66,6 @@
    -t target_dir        Extract files relativ to target_dir.
    -v                   Be verbose. Not yet used.
 
-Report bugs to <lange at informatik.uni-koeln.de>.
 EOF
     exit 0
 }
@@ -131,6 +130,8 @@
     [ -f $fpath/$c.tar ]      && extract $fpath/$c.tar cat
     [ -f $fpath/$c.tar.gz ]   && extract $fpath/$c.tar.gz zcat
     [ -f $fpath/$c.tar.bz2 ]  && extract $fpath/$c.tar.bz2 bzcat
+    [ -f $fpath/$c.tar.xz ]   && extract $fpath/$c.tar.xz xzcat
+    [ -f $fpath/$c.txz ]      && extract $fpath/$c.txz xzcat
 done
 
 if [ $tardone -eq 0 ]; then

Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:55:34 UTC (rev 6001)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:55:38 UTC (rev 6002)
@@ -51,7 +51,9 @@
     minor code cleanup
   * task_sysinfo: remove call of sysinfo (non open source software), check
     if blkid exists before calling it
-
+  * fai-debconf: exit 0 all the time, change comment
+  * ftar, ftar.8: add xz support
+  
   [ Michael Tautschnig ]
   * control: Move setup-storage to its own package (fai-setup-storage). Thanks
     Michael Prokop <mika at debian.org> for the patch (closes: #575812)

Modified: branches/stable/3.4/man/ftar.8
===================================================================
--- branches/stable/3.4/man/ftar.8	2010-08-17 12:55:34 UTC (rev 6001)
+++ branches/stable/3.4/man/ftar.8	2010-08-17 12:55:38 UTC (rev 6002)
@@ -1,5 +1,5 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
-.TH ftar 8 "18 October 2009"
+.TH ftar 8 "25 July 2010"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -25,7 +25,7 @@
 classes, one or more archives of the source directory are selected and
 extracted to the target.  The base target directory is the name of the
 source directory.  Template file must have suffix .tar, .tgz, .tar.gz,
-or .tar.bz2 depending on the type of archive.
+.tar.xz, .txz, .tbz2 or .tar.bz2 depending on the type of archive.
 
 The exit code returned by ftar is mostly 0.  For every successfully
 extracted tar file, a log message is printed to standard output.




More information about the Fai-commit mailing list