diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-09-02 22:48:17 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-09-02 22:48:17 (GMT) |
| commit | 564fbac7cdd2eae31d68f5d3c3186788b28f4fba (patch) | |
| tree | cc1d74560ac68c2594dfce0b5ee899f5e093b96e /Lib/distutils/command | |
| parent | 6f08f53e797848b6e2f5e7eeaf20f9dcaba3e28b (diff) | |
| parent | cfbd630a27c7ef31f6883dd21dbc4ece4d7b8bc4 (diff) | |
| download | cpython-564fbac7cdd2eae31d68f5d3c3186788b28f4fba.zip cpython-564fbac7cdd2eae31d68f5d3c3186788b28f4fba.tar.gz cpython-564fbac7cdd2eae31d68f5d3c3186788b28f4fba.tar.bz2 | |
Merge fix for #8286 from 3.2
Diffstat (limited to 'Lib/distutils/command')
| -rw-r--r-- | Lib/distutils/command/sdist.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/distutils/command/sdist.py b/Lib/distutils/command/sdist.py index 21ea61d..a9429a4 100644 --- a/Lib/distutils/command/sdist.py +++ b/Lib/distutils/command/sdist.py @@ -306,7 +306,10 @@ class sdist(Command): try: self.filelist.process_template_line(line) - except DistutilsTemplateError as msg: + # the call above can raise a DistutilsTemplateError for + # malformed lines, or a ValueError from the lower-level + # convert_path function + except (DistutilsTemplateError, ValueError) as msg: self.warn("%s, line %d: %s" % (template.filename, template.current_line, msg)) |