diff options
| author | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2021-04-03 14:50:40 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2022-02-14 17:41:18 +0100 |
| commit | 6acd556e2c4c604d71533ee94d2fdbc2b81fc0ed (patch) | |
| tree | b7849771fcb2ec5e2aa0962c14ae1d254996c1a4 | |
| parent | 8db5af7326c581014ca07dcd98beac30f2c90d4f (diff) | |
deb.git, scripts: Use cannot rather than can not for clarity
"Can not" may in some cases mean something different than "cannot",
use "cannot" to make sure there are no misunderstandings.
Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>
| -rw-r--r-- | gbp/deb/git.py | 4 | ||||
| -rw-r--r-- | gbp/scripts/common/__init__.py | 2 | ||||
| -rw-r--r-- | tests/component/deb/test_export_orig.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/gbp/deb/git.py b/gbp/deb/git.py index 4a17c2db..ed97f3e6 100644 --- a/gbp/deb/git.py +++ b/gbp/deb/git.py @@ -326,9 +326,9 @@ class DebianGitRepository(PkgGitRepository): gbp.log.debug("upstream signature state: %s" % upstream_signatures) commit, found_signature = self.get_pristine_tar_commit(source, component) if not commit and self.has_pristine_tar_branch(): - raise GitRepositoryError("Can not find pristine tar commit for archive '%s'" % output) + raise GitRepositoryError("Cannot find pristine tar commit for archive '%s'" % output) if not found_signature and upstream_signatures.is_on(): - raise GitRepositoryError("Can not find requested upstream signature for archive '%s' in pristine tar commit." % output) + raise GitRepositoryError("Cannot find requested upstream signature for archive '%s' in pristine tar commit." % output) try: signature = False if upstream_signatures.is_off() else found_signature self.pristine_tar.checkout(source.name, source.upstream_version, comp.type, output_dir, diff --git a/gbp/scripts/common/__init__.py b/gbp/scripts/common/__init__.py index 70e6f19d..3ab3b3f7 100644 --- a/gbp/scripts/common/__init__.py +++ b/gbp/scripts/common/__init__.py @@ -71,7 +71,7 @@ def get_component_tarballs(name, version, tarball, components): sig = None tarballs.append(DebianAdditionalTarball(cname, component, sig=sig)) if not os.path.exists(cname): - raise GbpError("Can not find component tarball %s" % cname) + raise GbpError("Cannot find component tarball %s" % cname) return tarballs diff --git a/tests/component/deb/test_export_orig.py b/tests/component/deb/test_export_orig.py index 8ff75982..22e9fa9d 100644 --- a/tests/component/deb/test_export_orig.py +++ b/tests/component/deb/test_export_orig.py @@ -112,7 +112,7 @@ class TestExportOrig(ComponentTestBase): '--component=foo', '--pristine-tar']) ok_(ret == 1, "Exporting tarballs must fail") - self._check_log(-1, "gbp:error: Can not find pristine tar commit for archive 'hello-debhelper_2.8.orig.tar.gz'") + self._check_log(-1, "gbp:error: Cannot find pristine tar commit for archive 'hello-debhelper_2.8.orig.tar.gz'") def test_tarball_dir_version_replacement(self): """Test that generating tarball from directory version substitution works""" @@ -220,7 +220,7 @@ class TestExportOrig(ComponentTestBase): '--pristine-tar', '--upstream-signatures=on']) ok_(ret == 1, "Exporting tarballs must fail") - self._check_log(-1, "gbp:error: Can not find requested upstream signature for archive " + self._check_log(-1, "gbp:error: Cannot find requested upstream signature for archive " "'hello-debhelper_2.6.orig.tar.gz' in pristine tar commit.") @RepoFixtures.quilt30(opts=['--pristine-tar']) |