diff options
author | Guido Günther <agx@sigxcpu.org> | 2015-02-21 16:03:47 +0100 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2015-03-27 12:10:55 +0100 |
commit | a33276d8da726d7e60908884cb404e56ec907064 (patch) | |
tree | 930e7a7818012aece80d881274402eab25f264d8 | |
parent | 74008c7b859a36f65e7dcaf99275025c9de74e84 (diff) |
Extract exception message in a less arcane way
-rwxr-xr-x | examples/gbp-add-patch | 2 | ||||
-rwxr-xr-x | gbp/scripts/buildpackage.py | 2 | ||||
-rwxr-xr-x | gbp/scripts/clone.py | 2 | ||||
-rw-r--r-- | gbp/scripts/create_remote_repo.py | 2 | ||||
-rw-r--r-- | gbp/scripts/dch.py | 2 | ||||
-rw-r--r-- | gbp/scripts/import_dsc.py | 4 | ||||
-rw-r--r-- | gbp/scripts/import_dscs.py | 2 | ||||
-rw-r--r-- | gbp/scripts/import_orig.py | 4 | ||||
-rwxr-xr-x | gbp/scripts/import_srpm.py | 2 | ||||
-rwxr-xr-x | gbp/scripts/pq.py | 2 | ||||
-rwxr-xr-x | gbp/scripts/pq_rpm.py | 2 | ||||
-rwxr-xr-x | gbp/scripts/pull.py | 2 |
12 files changed, 14 insertions, 14 deletions
diff --git a/examples/gbp-add-patch b/examples/gbp-add-patch index 8ecb1d1e..62d35ce3 100755 --- a/examples/gbp-add-patch +++ b/examples/gbp-add-patch @@ -105,7 +105,7 @@ def main(argv): except GitRepositoryError: retval = 1 except GbpError as err: - if len(err.__str__()): + if str(err): print >>sys.stderr, err retval = 1 diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py index 419f01de..04971594 100755 --- a/gbp/scripts/buildpackage.py +++ b/gbp/scripts/buildpackage.py @@ -622,7 +622,7 @@ def main(argv): except CommandExecFailed: retval = 1 except (GbpError, GitRepositoryError) as err: - if len(err.__str__()): + if str(err): gbp.log.err(err) retval = 1 except DebianSourceError as err: diff --git a/gbp/scripts/clone.py b/gbp/scripts/clone.py index 5232de9b..056092b9 100755 --- a/gbp/scripts/clone.py +++ b/gbp/scripts/clone.py @@ -121,7 +121,7 @@ def main(argv): gbp.log.err("Git command failed: %s" % err) retval = 1 except GbpError as err: - if len(err.__str__()): + if str(err): gbp.log.err(err) retval = 1 diff --git a/gbp/scripts/create_remote_repo.py b/gbp/scripts/create_remote_repo.py index 1b0d65b1..a6c62d8e 100644 --- a/gbp/scripts/create_remote_repo.py +++ b/gbp/scripts/create_remote_repo.py @@ -377,7 +377,7 @@ def main(argv): except CommandExecFailed: retval = 1 except (GbpError, GitRepositoryError) as err: - if len(err.__str__()): + if str(err): gbp.log.err(err) retval = 1 diff --git a/gbp/scripts/dch.py b/gbp/scripts/dch.py index 2df4b2d2..d0e9794d 100644 --- a/gbp/scripts/dch.py +++ b/gbp/scripts/dch.py @@ -542,7 +542,7 @@ def main(argv): GitRepositoryError, DebianSourceError, NoChangeLogError) as err: - if len(err.__str__()): + if str(err): gbp.log.err(err) ret = 1 return ret diff --git a/gbp/scripts/import_dsc.py b/gbp/scripts/import_dsc.py index a8a0abd2..f0c2a5e9 100644 --- a/gbp/scripts/import_dsc.py +++ b/gbp/scripts/import_dsc.py @@ -165,7 +165,7 @@ def apply_debian_patch(repo, unpack_dir, src, options, tag): sign=options.sign_tags, keyid=options.keyid) except (gbpc.CommandExecFailed, GitRepositoryError) as err: - msg = err.__str__() if len(err.__str__()) else '' + msg = str(err) or 'Unknown error, please report a bug' gbp.log.err("Failed to import Debian package: %s" % msg) raise GbpError finally: @@ -402,7 +402,7 @@ def main(argv): gbp.log.err("Git command failed: %s" % msg) ret = 1 except GbpError as err: - if len(err.__str__()): + if str(err): gbp.log.err(err) ret = 1 except SkipImport: diff --git a/gbp/scripts/import_dscs.py b/gbp/scripts/import_dscs.py index 4e445c31..30451ce2 100644 --- a/gbp/scripts/import_dscs.py +++ b/gbp/scripts/import_dscs.py @@ -155,7 +155,7 @@ def main(argv): raise GbpError("Failed to import '%s'" % dscs[0].dscfile) except (GbpError, gbpc.CommandExecFailed, GitRepositoryError) as err: - if len(err.__str__()): + if str(err): gbp.log.err(err) ret = 1 finally: diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py index d7ad7b48..d95c08f3 100644 --- a/gbp/scripts/import_orig.py +++ b/gbp/scripts/import_orig.py @@ -408,10 +408,10 @@ def main(argv): repo.pristine_tar_branch]: repo.force_head(current_branch, hard=True) except (gbpc.CommandExecFailed, GitRepositoryError) as err: - msg = err.__str__() if len(err.__str__()) else '' + msg = str(err) or 'Unknown error, please report a bug' raise GbpError("Import of %s failed: %s" % (source.path, msg)) except GbpError as err: - if len(err.__str__()): + if str(err): gbp.log.err(err) ret = 1 diff --git a/gbp/scripts/import_srpm.py b/gbp/scripts/import_srpm.py index a976f2ad..587e2f25 100755 --- a/gbp/scripts/import_srpm.py +++ b/gbp/scripts/import_srpm.py @@ -448,7 +448,7 @@ def main(argv): gbp.log.err("Git command failed: %s" % err) ret = 1 except GbpError as err: - if len(err.__str__()): + if str(err): gbp.log.err(err) ret = 1 except NoSpecError as err: diff --git a/gbp/scripts/pq.py b/gbp/scripts/pq.py index 1e1e96bf..4145648c 100755 --- a/gbp/scripts/pq.py +++ b/gbp/scripts/pq.py @@ -412,7 +412,7 @@ def main(argv): except CommandExecFailed: retval = 1 except (GbpError, GitRepositoryError) as err: - if len(err.__str__()): + if str(err): gbp.log.err(err) retval = 1 diff --git a/gbp/scripts/pq_rpm.py b/gbp/scripts/pq_rpm.py index 764ccff2..a05fdffc 100755 --- a/gbp/scripts/pq_rpm.py +++ b/gbp/scripts/pq_rpm.py @@ -453,7 +453,7 @@ def main(argv): gbp.log.err("Git command failed: %s" % err) retval = 1 except GbpError, err: - if len(err.__str__()): + if str(err): gbp.log.err(err) retval = 1 finally: diff --git a/gbp/scripts/pull.py b/gbp/scripts/pull.py index d0911983..15e4201a 100755 --- a/gbp/scripts/pull.py +++ b/gbp/scripts/pull.py @@ -160,7 +160,7 @@ def main(argv): except CommandExecFailed: retval = 1 except (GbpError, GitRepositoryError) as err: - if len(err.__str__()): + if str(err): gbp.log.err(err) retval = 1 |