Update of /cvsroot/alsa/alsa-kernel/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5949
Modified Files:
ksync
Log Message:
Fixed merging bugs (new files etc.)
Index: ksync
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/scripts/ksync,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ksync 9 Feb 2004 08:42:54 -0000 1.31
+++ ksync 21 Feb 2004 15:07:27 -0000 1.32
@@ -132,6 +132,7 @@
('/pci/ice1712/ice1724.c','ICE1724 driver'),
('/pci/ice1712' ,'ICE1712 driver'),
('/pci/korg1212' ,'KORG1212 driver'),
+ ('/pci/mixart' ,'MIXART driver'),
('/pci/nm256' ,'NM256 driver'),
('/include/hdsp.h' ,'RME HDSP driver'),
('/pci/rme9652/hdsp.c' ,'RME HDSP driver'),
@@ -918,8 +919,21 @@
bkfile = remap_alsa_file(i[string.find(i, '/'):-1])
fp.write(change_diff_line(i, bkfile))
idx = 1
+ elif i[0:13] == '--- /dev/null':
+ prevline = i
+ idx = 100
elif idx > 0 and idx < 4:
fp.write(change_diff_line(i, bkfile))
+ idx += 1
+ elif idx == 100:
+ str = string.expandtabs(i[string.find(i, '/'):-1])
+ str = str[0:string.find(str, ' ')]
+ bkfile = remap_alsa_file(str)
+ fp.write('Index: %s\n' % bkfile)
+ fp.write('diff -u %s.old %s\n' % (bkfile, bkfile))
+ fp.write(change_diff_line(prevline, bkfile))
+ fp.write(change_diff_line(i, bkfile))
+ idx = 3
else:
fp.write(i)
fp.close()
@@ -1047,6 +1061,8 @@
if t:
print lines
return
+ nlines = string.replace(nlines, '"', "'")
+ lines = string.replace(lines, '"', "'")
while os.system('bk import -tpatch -C -y"' + nlines + '" ' + ff + ' .'):
print 'BK patch import of %s error, xterm? (any key to continue or
Control-C to abort)' % ff
sys.stdin.readline()
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
