Author: saq
Date: Wed Sep 14 22:58:10 2005
New Revision: 6384
Modified:
cvs2svn-migration/trunk/migrator
Log:
- fixes for kernel.spec (a broken file and pipe race cond.)
Modified: cvs2svn-migration/trunk/migrator
==============================================================================
--- cvs2svn-migration/trunk/migrator (original)
+++ cvs2svn-migration/trunk/migrator Wed Sep 14 22:58:10 2005
@@ -19,6 +19,9 @@
source_re="^c.*"
#source_re=".*"
+# rlog: .../kernel/Attic/linux-2.4.18-xfs-19062002.patch.gz,v:1244: unexpected
end of file
+files_ignore=set(["linux-2.4.18-xfs-19062002.patch.gz,v"])
+
# internals follow
import cvs2svn_rcsparse
@@ -83,9 +86,11 @@
files={}
for f in atticfiles:
if not f.endswith(",v"): continue
+ if f in files_ignore: continue
files[f[:-2]]="%s/Attic/%s"%(dir,f)
for f in livefiles:
if not f.endswith(",v"): continue
+ if f in files_ignore: continue
files[f[:-2]]="%s/%s"%(dir,f)
return files
@@ -100,7 +105,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:/;/^%prep/q"],
+
p2=Popen(["sed",r"/^Icon:/d;/^Serial:/d;/^%define.*_kernel_ver/d;s/^Copyright:/License:/;/^%prep/,+99999d"],
stdin=p1.stdout,stdout=file(tmpspecfile,"w")
)
if p1.wait()!=0 or p2.wait()!=0:
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
