Skip to content

Commit

Permalink
Fix bad merge (#818)
Browse files Browse the repository at this point in the history
Merging two branches without the branch updated caused issues
in the unit tests due to incompatible changes in
`snapcraft.internal.sources`

Signed-off-by: Sergio Schvezov <sergio.schvezov@ubuntu.com>
  • Loading branch information
sergiusens authored Sep 21, 2016
1 parent 190463c commit 9d8b7e7
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions snapcraft/internal/sources.py
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,9 @@ def provision(self, dst, clean_target=True, keep_zip=False):
class Deb(FileBase):

def __init__(self, source, source_dir, source_tag=None,
source_branch=None):
super().__init__(source, source_dir, source_tag, source_branch)
source_branch=None, source_depth=None):
super().__init__(source, source_dir, source_tag,
source_branch, source_depth)
if source_tag:
raise IncompatibleOptionsError(
'can\'t specify a source-tag for a deb source')
Expand Down

0 comments on commit 9d8b7e7

Please sign in to comment.