[SCM] pkg-kde-jenkins packaging branch, master, updated. c020108c412f726f4b3ac49e71d4d8225cd11531

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-jenkins.git;a=commitdiff;h=ba67006

The following commit has been merged in the master branch:
commit ba6700616dc6f3645d048c4d795f2fbc54d14c57
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed May 11 11:53:52 2016 +0200

    Avoid tweaking the master branch when merged
---
 hooks/prepare/update_refresh_patches | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/hooks/prepare/update_refresh_patches b/hooks/prepare/update_refresh_patches
index f84e074..3915543 100755
--- a/hooks/prepare/update_refresh_patches
+++ b/hooks/prepare/update_refresh_patches
@@ -41,9 +41,6 @@ def process_options():
     arg_parser.add_argument('--upstream-tag-template',
                             default=os.environ.get('UPSTREAM_TAG_TEMPLATE',
                                                    'upstream/{version}'))
-    arg_parser.add_argument(
-        '--merged-upstream', action='store_true',
-        default=('true' == os.environ.get('MERGE_UPSTREAM', '').lower()))
     args = arg_parser.parse_args()
 
     if args.debug:
@@ -157,11 +154,9 @@ def main():
         logging.info('Missing tags, skipping')
         sys.exit(0)
 
-    merged_branch = 'master'
-    if not options.merged_upstream:
-        merged_branch = 'update_patches/merged'
-        # Create a merged branch
-        create_merged_branch(package_dir, current_tag, merged_branch)
+    merged_branch = 'update_patches/merged'
+    # Create a merged branch
+    create_merged_branch(package_dir, current_tag, merged_branch)
 
     # Import patches
     import_patches(package_dir)
@@ -180,8 +175,7 @@ def main():
         logging.info('No changes were needed')
         sys.exit(0)
 
-    if not options.merged_upstream:
-        cherry_pick_changes(package_dir, last_commit)
+    cherry_pick_changes(package_dir, last_commit)
 
 
 if __name__ == '__main__':

-- 
pkg-kde-jenkins packaging