cvs2svn-migration/trunk/migrator

[saq]

Author: saq
Date: Wed Sep 14 14:54:56 2005
New Revision: 6383

Modified:
   cvs2svn-migration/trunk/migrator
Log:
- make some more specs parseable

Modified: cvs2svn-migration/trunk/migrator
==============================================================================
--- cvs2svn-migration/trunk/migrator	(original)
+++ cvs2svn-migration/trunk/migrator	Wed Sep 14 14:54:56 2005
@@ -100,7 +100,7 @@
 		# This part would have been easier in another language
 		p1=Popen(["co","-p","-r"+rev,f[:-2]],stdout=PIPE,stderr=file("/dev/null","w"))
 		# post-processing to maximize the chance of a successful parse
-		p2=Popen(["sed",r"/^Icon:/d;/^Serial:/d;/^%define.*_kernel_ver/d;s/^Copyright:/License:/"],
+		p2=Popen(["sed",r"/^Icon:/d;/^Serial:/d;/^%define.*_kernel_ver/d;s/^Copyright:/License:/;/^%prep/q"],
 			stdin=p1.stdout,stdout=file(tmpspecfile,"w")
 		)
 		if p1.wait()!=0 or p2.wait()!=0:
@@ -108,7 +108,7 @@
 			continue
 
 		cmd1=["rpmbuild","--nodigest","--nosignature","--nodeps",
-			"--define","_kernel_ver_str 2.0.28",
+			"--define","_kernel_ver 2.0.28",
 			"--define","prep %dump",tmpspecfile]
 		p1=Popen(cmd1,stderr=PIPE)
 		p2=Popen(["awk",'/SOURCE[0-9]+|PATCH[0-9]+/ {sub(".*/","",$3);print $3}'],stdin=p1.stderr,stdout=PIPE)