Avoid importing packaging dir to upstream branch by adding it as default filter.

When a source rpm package is generated from a native source git tree, gbs will
import source to upstream branch together with packaging directory.

But packaging dir shouldn't exist in upstream branch.

Readmine issue:2114

Change-Id: I7442bc5ef8b5db4f7a5db1b95c530d605b0dc4a0
Signed-off-by: Li Jinjing <jinjingx.li@intel.com>

diff --git a/gitbuildsys/cmd_import.py b/gitbuildsys/cmd_import.py
index 6bf19b48b0e8372ddc5d266b4678bc43dccdc3de..d80b7b59a349846093a2a28d31f6d7288ae7eb4c 100644 (file)
--- a/gitbuildsys/cmd_import.py
+++ b/gitbuildsys/cmd_import.py
@@ -54,6 +54,7 @@ def main(args):
               "--packaging-dir=%s" % get_packaging_dir(args),
               "--upstream-branch=%s" % upstream_branch, path,
               "--upstream-tag=%s" % upstream_tag,
+              "--filter=%s" % get_packaging_dir(args),
               "--tmp-dir=%s" % tmp.path,
               ]
     if args.debug: