← Back to branch summary

~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to build/getversion.py

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2015-08-07 21:32:47 UTC
  • mfrom: (0.2.15) (4.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20150807213247-ozyewtmgsr6tkewl
Tags: 1.9.0-1
http://bugs.debian.org/791844
* Upload to unstable
* New upstream release.
  + Security fixes
    - CVE-2015-3184: Mixed anonymous/authenticated path-based authz with
      httpd 2.4
    - CVE-2015-3187: svn_repos_trace_node_locations() reveals paths hidden
      by authz
* Add >= 2.7 requirement for python-all-dev Build-Depends, needed to run
  tests.
* Remove Build-Conflicts against ruby-test-unit.  (Closes: #791844)
* Remove patches/apache_module_dependency in favor of expressing the
  dependencies in authz_svn.load/dav_svn.load.
* Build-Depend on apache2-dev (>= 2.4.16) to ensure ap_some_authn_required()
  is available when building mod_authz_svn and Depend on apache2-bin (>=
  2.4.16) for runtime support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
build/getversion.py
26
26
import os
27
27
import re
28
28
import sys
 
29
import traceback
29
30
 
30
31
__all__ = ['Parser', 'Result']
31
32
 
64
65
 
65
66
  try:
66
67
    r = p.parse(include_file)
67
 
  except IOError, e:
68
 
    usage_and_exit(str(e))
 
68
  except IOError:
 
69
    typ, val, tb = sys.exc_info()
 
70
    msg = ''.join(traceback.format_exception_only(typ, val))
 
71
    usage_and_exit(msg)
69
72
  sys.stdout.write("%d.%d.%d" % (r.major, r.minor, r.patch))
70
73
 
71
74
 
75
78
 
76
79
  try:
77
80
    r = p.parse(include_file)
78
 
  except IOError, e:
79
 
    usage_and_exit(str(e))
 
81
  except IOError:
 
82
    typ, val, tb = sys.exc_info()
 
83
    msg = ''.join(traceback.format_exception_only(typ, val))
 
84
    usage_and_exit(msg)
80
85
  major = r.version / 1000000
81
86
  minor = (r.version - (major * 1000000)) / 1000
82
87
  micro = (r.version - (major * 1000000) - (minor * 1000))