[alsa-cvslog] alsa: ksync: fixed small problems with double merge (ASAP: linus + mm)

[<ro...@pe...>]

changeset:   58:c708f685322f3507c6b6dad1200a39911b7b196a
tag:         tip
user:        ro...@se...
date:        Thu Sep 28 15:43:22 2006 +0200
files:       ksync
description:
ksync: fixed small problems with double merge (ASAP: linus + mm)


diff -r 259e7d78636894abd730c320dae3b22caf96dd83 -r c708f685322f3507c6b6dad1200a39911b7b196a ksync
--- a/ksync	Thu Sep 28 12:44:00 2006 +0200
+++ b/ksync	Thu Sep 28 15:43:22 2006 +0200
@@ -903,7 +903,7 @@ def merge1(entry, t=False, do_patch_leve
         	print 'New files: %s' % nfiles
 
 	if USE_STG and do_patch_level:
-		if log['patchlevel'] == 'ASAP':
+		if log['patchlevel'] == 'asap':
 			branch = 'linus'
 		my_popen3s('stg branch %s' % branch, filter=['is already the current branch'], ignore_stdout=quiet)
 
@@ -1444,7 +1444,7 @@ def git_merge(rev):
  		merge1(entry, do_patch_level=True, quiet=True)
  		reason += '\nFirst level merging done.'
  		if branch == 'linus':
-			my_popen3s('stg branch mm' % GITROOT_BRANCH, filter=['is already the current branch'])
+			my_popen3s('stg branch mm', filter=['is already the current branch'], ignore_stdout=True)
 			reason += '\nSwitch to branch mm ok.'
  			merge1(entry, quiet=True)
 		ok = True