← Back to branch summary

~ubuntu-branches/ubuntu/natty/python2.6/natty-security

« back to all changes in this revision

Viewing changes to Lib/tarfile.py

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-06-24 00:31:14 UTC
  • mfrom: (10.1.18 sid)
  • Revision ID: james.westby@ubuntu.com-20100624003114-jmwmbudlpucl6ip3
Tags: 2.6.5+20100616-1ubuntu1
* Merge from Debian Unstable.  Remaining Ubuntu changes:
  - Add new symbols to libpython.symbols.in
  - Re-enable the profiled build on all architectures
  - Priority for python2.6-minimal is required instead of optional
  - python2.6-minimal and python2.6 Conflict python-central
    (<< 0.6.11ubuntu6)

Show diffs side-by-side

added added

removed removed

Lines of Context:
Lib/tarfile.py
30
30
"""Read from and write to tar format archives.
31
31
"""
32
32
 
33
 
__version__ = "$Revision: 80617 $"
 
33
__version__ = "$Revision: 81664 $"
34
34
# $Source$
35
35
 
36
36
version     = "0.9.0"
37
37
__author__  = "Lars Gust�bel (lars@gustaebel.de)"
38
 
__date__    = "$Date: 2010-04-29 17:35:30 +0200 (Do, 29. Apr 2010) $"
39
 
__cvsid__   = "$Id: tarfile.py 80617 2010-04-29 15:35:30Z lars.gustaebel $"
 
38
__date__    = "$Date: 2010-06-03 12:07:08 +0200 (Do, 03. Jun 2010) $"
 
39
__cvsid__   = "$Id: tarfile.py 81664 2010-06-03 10:07:08Z lars.gustaebel $"
40
40
__credits__ = "Gustavo Niemeyer, Niels Gust�bel, Richard Townsend."
41
41
 
42
42
#---------
1880
1880
        tarinfo.mode = stmd
1881
1881
        tarinfo.uid = statres.st_uid
1882
1882
        tarinfo.gid = statres.st_gid
1883
 
        if stat.S_ISREG(stmd):
 
1883
        if type == REGTYPE:
1884
1884
            tarinfo.size = statres.st_size
1885
1885
        else:
1886
1886
            tarinfo.size = 0L