From 090aaafdb9ff73e3c90545a2774ba08551024f13 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 19 Jun 2019 22:04:57 +0100 Subject: do not create a local branch for next, point master to origin/next --- src/backend/libsisyphus.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py index c5773c2..f8ccb52 100644 --- a/src/backend/libsisyphus.py +++ b/src/backend/libsisyphus.py @@ -573,7 +573,7 @@ def setPortageEnvTesting(): subprocess.call(['git', 'init', '-q']) subprocess.call(['git', 'remote', 'add', 'origin', 'https://pagure.io/redcore/portage.git']) subprocess.call(['git', 'pull', '--depth=1', 'origin', 'next']) - subprocess.call(['git', 'checkout', '-b', 'next', 'origin/next']) + subprocess.call(['git', 'branch', '-u', 'origin/next', 'master']) if not os.path.isdir(os.path.join(redcoreEbuildDir, '.git')): print("\nI am injecting Redcore Linux overlay (next)\n") @@ -581,7 +581,7 @@ def setPortageEnvTesting(): subprocess.call(['git', 'init', '-q']) subprocess.call(['git', 'remote', 'add', 'origin', 'https://pagure.io/redcore/redcore-desktop.git']) subprocess.call(['git', 'pull', '--depth=1', 'origin', 'next']) - subprocess.call(['git', 'checkout', '-b', 'next', 'origin/next']) + subprocess.call(['git', 'branch', '-u', 'origin/next', 'master']) if not os.path.isdir(os.path.join(portageConfigDir, '.git')): print("\nI am injecting Redcore Linux portage configuration (next)\n") @@ -589,7 +589,7 @@ def setPortageEnvTesting(): subprocess.call(['git', 'init', '-q']) subprocess.call(['git', 'remote', 'add', 'origin', 'https://pagure.io/redcore/redcore-build.git']) subprocess.call(['git', 'pull', '--depth=1', 'origin', 'next']) - subprocess.call(['git', 'checkout', '-b', 'next', 'origin/next']) + subprocess.call(['git', 'branch', '-u', 'origin/next', 'master']) def setHardenedProfile(): subprocess.call(['eselect', 'profile', 'set', 'default/linux/amd64/17.0/hardened']) -- cgit v1.2.3