diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2018-10-23 13:21:23 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2018-10-23 13:21:23 +0300 |
| commit | 0086b0546831bcd70814bd732c1aad9ecfc38d3b (patch) | |
| tree | 776293aca32fa5dd0473ad45747965cfe3512c9f | |
| parent | b4b4163e453b5e8da9cd61c60c8dab2487519a9a (diff) | |
Adapt to inheriting butl::invalid_path from std::invalid_argument
| -rw-r--r-- | bpkg/fetch-git.cxx | 8 | ||||
| -rw-r--r-- | bpkg/manifest-utility.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/bpkg/fetch-git.cxx b/bpkg/fetch-git.cxx index 15d83d1..cd5d597 100644 --- a/bpkg/fetch-git.cxx +++ b/bpkg/fetch-git.cxx @@ -1442,14 +1442,14 @@ namespace bpkg origin_url (co, fsdir, url); } } - catch (const invalid_argument& e) + catch (const invalid_path& e) { - fail << "invalid repository URL for submodule '" << psd << "': " + fail << "invalid repository path for submodule '" << psd << "': " << e << endg; } - catch (const invalid_path& e) + catch (const invalid_argument& e) { - fail << "invalid repository path for submodule '" << psd << "': " + fail << "invalid repository URL for submodule '" << psd << "': " << e << endg; } diff --git a/bpkg/manifest-utility.cxx b/bpkg/manifest-utility.cxx index 484ba32..c329108 100644 --- a/bpkg/manifest-utility.cxx +++ b/bpkg/manifest-utility.cxx @@ -131,14 +131,14 @@ namespace bpkg dr << endf; } } - catch (const invalid_argument& e) - { - fail << "invalid repository location '" << s << "': " << e << endf; - } catch (const invalid_path& e) { fail << "invalid repository path '" << s << "': " << e << endf; } + catch (const invalid_argument& e) + { + fail << "invalid repository location '" << s << "': " << e << endf; + } catch (const system_error& e) { fail << "failed to guess repository type for '" << s << "': " << e << endf; |