alsatool: kmerge fixes

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/alsatool b/alsatool
index 9b4c84607daf79b8b25dccc5a63bde2c31161a73..f8549bfe8afd96f4265d3f35966be197c48cb9fd 100755 (executable)
--- 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 7c884dfbd1e474f45cfbc83f5d050432a54aaba3..2e5e7747c4ab4a9a5ebb4e672417f28d3c326099 100644 (file)
--- 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')