python-adfs

changeset 70:2595703db85f

Committed pending changes and the license update for the 0.40 release.
author David Boddie <david@boddie.org.uk>
date Sat Aug 21 21:34:28 2010 +0200
parents 6dd865e79bff
children 6bf4e64c9c17
files ADF2INF.py
diffstat 1 files changed, 16 insertions(+), 13 deletions(-) [+]
line diff
     1.1 --- a/ADF2INF.py	Sat Aug 21 21:33:52 2010 +0200
     1.2 +++ b/ADF2INF.py	Sat Aug 21 21:34:28 2010 +0200
     1.3 @@ -9,23 +9,20 @@
     1.4  
     1.5  License:
     1.6  
     1.7 -Copyright (c) 2000-2008, David Boddie
     1.8 +Copyright (c) 2000-2010, David Boddie
     1.9  
    1.10 -This software is free software; you can redistribute it and/or
    1.11 -modify it under the terms of the GNU General Public License as
    1.12 -published by the Free Software Foundation; either version 2 of
    1.13 -the License, or (at your option) any later version.
    1.14 +This program is free software: you can redistribute it and/or modify
    1.15 +it under the terms of the GNU General Public License as published by
    1.16 +the Free Software Foundation, either version 3 of the License, or
    1.17 +(at your option) any later version.
    1.18  
    1.19 -This software is distributed in the hope that it will be useful,
    1.20 +This program is distributed in the hope that it will be useful,
    1.21  but WITHOUT ANY WARRANTY; without even the implied warranty of
    1.22  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    1.23  GNU General Public License for more details.
    1.24  
    1.25 -You should have received a copy of the GNU General Public
    1.26 -License along with this library; see the file COPYING
    1.27 -If not, write to the Free Software Foundation, Inc.,
    1.28 -59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    1.29 -
    1.30 +You should have received a copy of the GNU General Public License
    1.31 +along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1.32  """
    1.33  
    1.34  
    1.35 @@ -140,6 +137,7 @@
    1.36          \r( [-d | --create-directory]
    1.37          \r  [ (-t | --file-types) [(-s separator) | --separator=character] ]
    1.38          \r  [(-c convert) | --convert=characters]
    1.39 +        \r  [-m | --time-stamps]
    1.40          \r  <ADF file> <destination path> ) |
    1.41          \r
    1.42          \r( (-v | --verify) <ADF file> ) |
    1.43 @@ -151,7 +149,7 @@
    1.44      
    1.45      else:
    1.46      
    1.47 -        syntax = "[-l] [-d] [-t] [-s separator] [-v] [-c characters] " + \
    1.48 +        syntax = "[-l] [-d] [-t] [-s separator] [-v] [-c characters] [-m] " + \
    1.49                   "<ADF file> <destination path>"
    1.50          match = read_getopt_input(sys.argv)
    1.51      
    1.52 @@ -196,6 +194,9 @@
    1.53          print
    1.54          print "    %s" % repr(default_convert_dict)
    1.55          print
    1.56 +        print "The -m flag determines whether the files extracted from the disc"
    1.57 +        print "image should retain their time stamps on the target system."
    1.58 +        print
    1.59          sys.exit()
    1.60      
    1.61      
    1.62 @@ -207,6 +208,7 @@
    1.63      use_separator = match.has_key("s") or match.has_key("separator")
    1.64      verify = match.has_key("v") or match.has_key("verify")
    1.65      convert = match.has_key("c") or match.has_key("convert")
    1.66 +    with_time_stamps = match.has_key("m") or match.has_key("time-stamps")
    1.67      
    1.68      adf_file = match["ADF file"]
    1.69      
    1.70 @@ -333,7 +335,8 @@
    1.71      
    1.72      # Extract the files
    1.73      adfsdisc.extract_files(
    1.74 -        out_path, adfsdisc.files, filetypes, separator, convert_dict
    1.75 +        out_path, adfsdisc.files, filetypes, separator, convert_dict,
    1.76 +        with_time_stamps
    1.77          )
    1.78      
    1.79      # Exit