Skip to content

Commit 3e63177

Browse files
committed
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 <[email protected]>
1 parent 2b98d45 commit 3e63177

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

gbp/deb/git.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,9 +326,9 @@ def create_upstream_tarball_via_pristine_tar(self, source, output_dir, comp, ups
326326
gbp.log.debug("upstream signature state: %s" % upstream_signatures)
327327
commit, found_signature = self.get_pristine_tar_commit(source, component)
328328
if not commit and self.has_pristine_tar_branch():
329-
raise GitRepositoryError("Can not find pristine tar commit for archive '%s'" % output)
329+
raise GitRepositoryError("Cannot find pristine tar commit for archive '%s'" % output)
330330
if not found_signature and upstream_signatures.is_on():
331-
raise GitRepositoryError("Can not find requested upstream signature for archive '%s' in pristine tar commit." % output)
331+
raise GitRepositoryError("Cannot find requested upstream signature for archive '%s' in pristine tar commit." % output)
332332
try:
333333
signature = False if upstream_signatures.is_off() else found_signature
334334
self.pristine_tar.checkout(source.name, source.upstream_version, comp.type, output_dir,

gbp/scripts/common/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def get_component_tarballs(name, version, tarball, components):
7171
sig = None
7272
tarballs.append(DebianAdditionalTarball(cname, component, sig=sig))
7373
if not os.path.exists(cname):
74-
raise GbpError("Can not find component tarball %s" % cname)
74+
raise GbpError("Cannot find component tarball %s" % cname)
7575
return tarballs
7676

7777

tests/component/deb/test_export_orig.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def test_pristine_tar_commit_non_existent(self):
112112
'--component=foo',
113113
'--pristine-tar'])
114114
ok_(ret == 1, "Exporting tarballs must fail")
115-
self._check_log(-1, "gbp:error: Can not find pristine tar commit for archive 'hello-debhelper_2.8.orig.tar.gz'")
115+
self._check_log(-1, "gbp:error: Cannot find pristine tar commit for archive 'hello-debhelper_2.8.orig.tar.gz'")
116116

117117
def test_tarball_dir_version_replacement(self):
118118
"""Test that generating tarball from directory version substitution works"""
@@ -220,7 +220,7 @@ def test_pristine_tar_upstream_signatures_without(self):
220220
'--pristine-tar',
221221
'--upstream-signatures=on'])
222222
ok_(ret == 1, "Exporting tarballs must fail")
223-
self._check_log(-1, "gbp:error: Can not find requested upstream signature for archive "
223+
self._check_log(-1, "gbp:error: Cannot find requested upstream signature for archive "
224224
"'hello-debhelper_2.6.orig.tar.gz' in pristine tar commit.")
225225

226226
@RepoFixtures.quilt30(opts=['--pristine-tar'])

0 commit comments

Comments
 (0)