From: SoonKyu Park <sk7.park@samsung.com>
Date: Wed, 27 Jul 2016 00:59:46 +0000 (+0900)
Subject: Merge branch 'master' into devel
X-Git-Tag: staging-released-tools-18.01.7~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ba349820ba24db5c907dce8edb5b6d5565001bcf;p=tools%2Fgbs.git

Merge branch 'master' into devel

Change-Id: Icfcd06335af9da1501d03dbae38a06484dec1153
---

ba349820ba24db5c907dce8edb5b6d5565001bcf
diff --cc debian/changelog
index 5461a51,6227ecf..6227ecf
mode 100755,100644..100755
--- a/debian/changelog
+++ b/debian/changelog
diff --cc docs/RELEASE_NOTES
index 2833939,25746ca..25746ca
mode 100755,100644..100755
--- a/docs/RELEASE_NOTES
+++ b/docs/RELEASE_NOTES
diff --cc gitbuildsys/__init__.py
index fbd1279,4ab242c..4ab242c
mode 100755,100644..100755
--- a/gitbuildsys/__init__.py
+++ b/gitbuildsys/__init__.py
diff --cc gitbuildsys/cmd_build.py
index 948933a,5fdaa75..143756b
--- a/gitbuildsys/cmd_build.py
+++ b/gitbuildsys/cmd_build.py
@@@ -223,9 -223,7 +223,9 @@@ def prepare_depanneur_opts(args)
      if args.skip_srcrpm:
          cmd_opts += ['--skip-srcrpm']
      if args.fail_fast:
- 	     cmd_opts += ['--fail-fast']
+         cmd_opts += ['--fail-fast']
 +    if args.keepgoing:
 +        cmd_opts += ['--keepgoing=%s' % args.keepgoing]
      #
      if args.package_list:
          package_list = args.package_list.split(',')
diff --cc packaging/gbs.changes
index cb17097,88bd786..88bd786
mode 100755,100644..100755
--- a/packaging/gbs.changes
+++ b/packaging/gbs.changes
diff --cc packaging/gbs.spec
index 5fc965c,7e54f83..7e54f83
mode 100755,100644..100755
--- a/packaging/gbs.spec
+++ b/packaging/gbs.spec