Skip to content

Small fixes (split out of #79) #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
andrewshadura wants to merge 1 commit into from
Closed

Small fixes (split out of #79) #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gbp/deb/git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,9 +326,9 @@ def create_upstream_tarball_via_pristine_tar(self, source, output_dir, comp, ups
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,
Expand Down
2 changes: 1 addition & 1 deletion gbp/scripts/common/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
4 changes: 2 additions & 2 deletions tests/component/deb/test_export_orig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def test_pristine_tar_commit_non_existent(self):
'--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"""
Expand Down Expand Up @@ -220,7 +220,7 @@ def test_pristine_tar_upstream_signatures_without(self):
'--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'])
Expand Down