mtd/scripts patchin.xml,1.3,1.4 treewalk.py,1.2,1.3

[gleixner at infradead.org]

Update of /home/cvs/mtd/scripts
In directory phoenix.infradead.org:/tmp/cvs-serv10325

Modified Files:
	patchin.xml treewalk.py 
Log Message:
Fix bk handling according to Jarkko\'s suggestions

Index: patchin.xml
===================================================================
RCS file: /home/cvs/mtd/scripts/patchin.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- patchin.xml	14 Mar 2005 12:09:04 -0000	1.3
+++ patchin.xml	14 Mar 2005 16:54:48 -0000	1.4
@@ -21,7 +21,7 @@
 one of the checks fails, the processing is stopped.
 
 
-<ACTION name="bk" depends="bk" except="rm" location="dest">
+<ACTION name="bk" depends="bk" except="rm">
 	rm -f $destfiles;
 	bk co -ql $destfiles;
 </ACTION>
@@ -31,9 +31,6 @@
 
 except:    Except on option(s) seperated by ','
 
-location:  Either 'src' for source path or 'dest' for destination path
-           Default is src
-
 mode:      Either 'single' or 'all'. Default is single
            If mode == single, then the action is called 
            for each file seperately and the $*files
@@ -110,10 +107,15 @@
 	<CHECKTARGET file="Makefile" pattern="PATCHLEVEL.=.6" 
 		help="Linux-Kernel 2.6" />
 
-	<ACTION name="bk" depends="bk" except="rm" mode="all">
+	<ACTION name="bk" depends="bk" except="rm">
 		cd $dstpath;
-		rm -f $dstfiles;
-		bk co -ql $dstfiles
+		if [ -e "SCCS/s.$dstfiles" ];
+		then 
+			bk unedit -q $dstfiles; 
+			bk edit -q $dstfiles;
+		else
+			rm -f $dstfiles;
+		fi
 	</ACTION>
 
 	<ACTION name="cp" depends="cp" except="rm,ln">

Index: treewalk.py
===================================================================
RCS file: /home/cvs/mtd/scripts/treewalk.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- treewalk.py	14 Mar 2005 09:54:57 -0000	1.2
+++ treewalk.py	14 Mar 2005 16:54:48 -0000	1.3
@@ -111,7 +111,7 @@
 	
 	# Set the action
 	def setAction(self, action):
-		self.action = action.replace("\n", "")
+		self.action = action.replace("\n","")
 
 	# Is action active ?
 	def isActive(self):