1 |
commit: 23adf50912a502873b4799ce74c2ef5e5814f508 |
2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
3 |
AuthorDate: Mon Mar 31 15:39:56 2014 +0000 |
4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
5 |
CommitDate: Mon Mar 31 15:39:56 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=23adf509 |
7 |
|
8 |
config/fielddef: log path of the missing licenses file |
9 |
|
10 |
--- |
11 |
roverlay/config/fielddef.py | 18 +++++++++++++----- |
12 |
1 file changed, 13 insertions(+), 5 deletions(-) |
13 |
|
14 |
diff --git a/roverlay/config/fielddef.py b/roverlay/config/fielddef.py |
15 |
index d5ff53d..ee4e943 100644 |
16 |
--- a/roverlay/config/fielddef.py |
17 |
+++ b/roverlay/config/fielddef.py |
18 |
@@ -140,12 +140,20 @@ class DescriptionFieldDefinition ( object ): |
19 |
"config: LICENSEMAP.licenses_file is not set." |
20 |
) |
21 |
|
22 |
- licenses_list = list ( |
23 |
- itertools.chain.from_iterable ( |
24 |
- line.strip().split ( None ) for line in |
25 |
- roverlay.util.fileio.read_text_file ( LICENSE_FILE ) |
26 |
+ try: |
27 |
+ licenses_list = list ( |
28 |
+ itertools.chain.from_iterable ( |
29 |
+ line.strip().split ( None ) for line in |
30 |
+ roverlay.util.fileio.read_text_file ( LICENSE_FILE ) |
31 |
+ ) |
32 |
) |
33 |
- ) |
34 |
+ except IOError as err: |
35 |
+ if err.errno == errno.ENOENT: |
36 |
+ self.logger.critical ( |
37 |
+ "licenses file {!r} does not exist.".format ( LICENSE_FILE ) |
38 |
+ ) |
39 |
+ # -- end if |
40 |
+ raise |
41 |
|
42 |
self.logger.debug ( |
43 |
"Using {n:d} licenses from file: {!r}".format ( |