From a654321038ee4805b9603d6e2340f5e8185c165a Mon Sep 17 00:00:00 2001 From: root Date: Mon, 18 Jan 2010 17:30:28 +0100 Subject: [PATCH] alsatool: kmerge fixes Signed-off-by: Jaroslav Kysela --- alsatool | 6 +++--- config.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/alsatool b/alsatool index 9b4c846..f8549bf 100755 --- a/alsatool +++ b/alsatool @@ -633,7 +633,7 @@ def root(argv): if argv == None: eprint('Specify root directory.') sys.exit(1) - config.ROOT=os.path.abspath(argv[0]) + config.ROOT=os.path.abspath(argv) def verbose(argv): config.VERBOSE=True @@ -1049,8 +1049,8 @@ def kmerge(argv=''): if os.system(git0 + ' checkout ' + mbranch): if os.system(git0 + ' checkout linux-2.6'): raise ValueError, 'checkout linux-2.6' - if os.system(git0 + ' checkout -b ' + mbranch): - raise ValueError, 'checkout -b ' + mbranch + if os.system(git0 + ' checkout -b ' + mbranch): + raise ValueError, 'checkout -b ' + mbranch checkout = True if os.system(git0 + ' pull ' + url + ' ' + branch): raise ValueError, ' pull ' + url + ' ' + branch diff --git a/config.py b/config.py index 7c884df..2e5e774 100644 --- a/config.py +++ b/config.py @@ -13,8 +13,8 @@ GIT_KERNEL_MERGE = 'v2.6.32' GIT_DRIVER_MERGE = 'v1.0.21' GIT_MERGE_REPOS = [ ('git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git', 'master', 'linux-2.6', 'http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git'), - ('git@git.alsa-project.org:alsa-kernel.git', 'fixes', 'perex-fixes', 'http://git.alsa-project.org/http/alsa-kernel.git'), - ('git@git.alsa-project.org:alsa-kernel.git', 'devel', 'perex-devel', 'http://git.alsa-project.org/http/alsa-kernel.git'), + ('git://git.alsa-project.org/alsa-kernel.git', 'fixes', 'perex-fixes', 'http://git.alsa-project.org/http/alsa-kernel.git'), + ('git://git.alsa-project.org/alsa-kernel.git', 'devel', 'perex-devel', 'http://git.alsa-project.org/http/alsa-kernel.git'), ('git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git', 'topic/misc', 'tiwai-topic-misc', 'http://www.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git'), ('git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git', 'topic/hda', 'tiwai-topic-hda', 'http://www.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git'), ('git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git', 'topic/asoc', 'tiwai-topic-asoc', 'http://www.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git') -- 2.47.1