From 9d8b7e7e748cad9a443e4634009adf4c82eeb8a0 Mon Sep 17 00:00:00 2001 From: Sergio Schvezov Date: Wed, 21 Sep 2016 16:16:44 +0200 Subject: [PATCH] Fix bad merge (#818) 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 --- snapcraft/internal/sources.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/snapcraft/internal/sources.py b/snapcraft/internal/sources.py index 57b04deff5..cf36113cb7 100644 --- a/snapcraft/internal/sources.py +++ b/snapcraft/internal/sources.py @@ -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')