diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/base.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/package.bbclass | 6 | ||||
-rw-r--r-- | meta/classes/sanity.bbclass | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 641316d1fa..196acdbb30 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -108,7 +108,7 @@ python base_do_fetch() { | |||
108 | try: | 108 | try: |
109 | fetcher = bb.fetch2.Fetch(src_uri, localdata) | 109 | fetcher = bb.fetch2.Fetch(src_uri, localdata) |
110 | fetcher.download() | 110 | fetcher.download() |
111 | except bb.fetch2.BBFetchException, e: | 111 | except bb.fetch2.BBFetchException as e: |
112 | raise bb.build.FuncFailed(e) | 112 | raise bb.build.FuncFailed(e) |
113 | } | 113 | } |
114 | 114 | ||
@@ -128,7 +128,7 @@ python base_do_unpack() { | |||
128 | try: | 128 | try: |
129 | fetcher = bb.fetch2.Fetch(src_uri, localdata) | 129 | fetcher = bb.fetch2.Fetch(src_uri, localdata) |
130 | fetcher.unpack(rootdir) | 130 | fetcher.unpack(rootdir) |
131 | except bb.fetch2.BBFetchException, e: | 131 | except bb.fetch2.BBFetchException as e: |
132 | raise bb.build.FuncFailed(e) | 132 | raise bb.build.FuncFailed(e) |
133 | } | 133 | } |
134 | 134 | ||
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 1a8da40fdb..96228b0bc0 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -777,7 +777,8 @@ python split_and_strip_files () { | |||
777 | try: | 777 | try: |
778 | ltarget = cpath.realpath(file, dvar, False) | 778 | ltarget = cpath.realpath(file, dvar, False) |
779 | s = cpath.lstat(ltarget) | 779 | s = cpath.lstat(ltarget) |
780 | except OSError, (err, strerror): | 780 | except OSError as e: |
781 | (err, strerror) = e.args | ||
781 | if err != errno.ENOENT: | 782 | if err != errno.ENOENT: |
782 | raise | 783 | raise |
783 | # Skip broken symlinks | 784 | # Skip broken symlinks |
@@ -855,7 +856,8 @@ python split_and_strip_files () { | |||
855 | # Skip it if the target doesn't exist | 856 | # Skip it if the target doesn't exist |
856 | try: | 857 | try: |
857 | s = os.stat(fpath) | 858 | s = os.stat(fpath) |
858 | except OSError, (err, strerror): | 859 | except OSError as e: |
860 | (err, strerror) = e.args | ||
859 | if err != errno.ENOENT: | 861 | if err != errno.ENOENT: |
860 | raise | 862 | raise |
861 | continue | 863 | continue |
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index ac2314fdcf..766e97e916 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -235,12 +235,14 @@ def check_create_long_filename(filepath, pathname): | |||
235 | f = file(testfile, "w") | 235 | f = file(testfile, "w") |
236 | f.close() | 236 | f.close() |
237 | os.remove(testfile) | 237 | os.remove(testfile) |
238 | except IOError as (errno, strerror): | 238 | except IOError as e: |
239 | errno, strerror = e.args | ||
239 | if errno == 36: # ENAMETOOLONG | 240 | if errno == 36: # ENAMETOOLONG |
240 | return "Failed to create a file with a long name in %s. Please use a filesystem that does not unreasonably limit filename length.\n" % pathname | 241 | return "Failed to create a file with a long name in %s. Please use a filesystem that does not unreasonably limit filename length.\n" % pathname |
241 | else: | 242 | else: |
242 | return "Failed to create a file in %s: %s.\n" % (pathname, strerror) | 243 | return "Failed to create a file in %s: %s.\n" % (pathname, strerror) |
243 | except OSError as (errno, strerror): | 244 | except OSError as e: |
245 | errno, strerror = e.args | ||
244 | return "Failed to create %s directory in which to run long name sanity check: %s.\n" % (pathname, strerror) | 246 | return "Failed to create %s directory in which to run long name sanity check: %s.\n" % (pathname, strerror) |
245 | return "" | 247 | return "" |
246 | 248 | ||