From: Li Jinjing <jinjingx.li@intel.com>
Date: Sun, 14 Sep 2014 16:15:09 +0000 (+0800)
Subject: Avoid importing packaging dir to upstream branch by adding it as default filter.
X-Git-Tag: 0.23~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae19cc8ac293e137901d840f90240b26dedd119d;p=tools%2Fgbs.git

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 6bf19b4..d80b7b5 100644
--- 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: