git-migration: pld-git.sh - exact match when looking for package in cvs.bla...

[draenog]

Author: draenog                      Date: Wed Feb  9 22:21:33 2011 GMT
Module: git-migration                 Tag: HEAD
---- Log message:
- exact match when looking for package in cvs.blacklist

---- Files affected:
git-migration:
   pld-git.sh (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: git-migration/pld-git.sh
diff -u git-migration/pld-git.sh:1.16 git-migration/pld-git.sh:1.17
--- git-migration/pld-git.sh:1.16	Wed Feb  9 21:32:04 2011
+++ git-migration/pld-git.sh	Wed Feb  9 23:21:28 2011
@@ -96,7 +96,7 @@
 	touch cvs.blacklist
 	install -d $gitdir cvs2svn-tmp
 	for pkg in ${@:-$(cat cvs.pkgs)}; do
-		grep -qF $pkg cvs.blacklist && continue
+		grep -qxF $pkg cvs.blacklist && continue
 
 		# can't resume, drop old efforts
 		rm -rf $gitdir/$pkg
@@ -131,7 +131,7 @@
 	touch cvs.blacklist
 	install -d git-import
 	for pkg in ${@:-$(cat cvs.pkgs)}; do
-		grep -qF $pkg cvs.blacklist && continue
+		grep -qxF $pkg cvs.blacklist && continue
 
 		# faster startup, skip existing ones for now
 #		test -d git-import/$pkg && continue
@@ -152,7 +152,7 @@
 
 	cvs_pkgs
 	for pkg in ${@:-$(cat cvs.pkgs)}; do
-		grep -qF $pkg cvs.blacklist && continue
+		grep -qxF $pkg cvs.blacklist && continue
 
 		cd gitroot/$pkg
 		git filter-branch --msg-filter "$msgconv" --tag-name-filter cat -- --all
@@ -188,8 +188,8 @@
 	cvs_pkgs
 	install -d git
 	for pkg in ${@:-$(cat cvs.pkgs)}; do
-		grep -qF $pkg cvs.blacklist && continue
-		grep -qF $pkg git.blacklist && continue
+		grep -qxF $pkg cvs.blacklist && continue
+		grep -qxF $pkg git.blacklist && continue
 
 		test -d $gitdir/$pkg
 
@@ -207,7 +207,7 @@
 
 	git_dirs
 	for pkg in $(cat git.dirs); do
-		grep -qF $pkg cvs.blacklist && continue
+		grep -qxF $pkg cvs.blacklist && continue
 		[ -s git-import/.$pkg.shortlog ] && continue
 
 		cd git-import/$pkg
@@ -226,7 +226,7 @@
 
 	git_dirs
 	for pkg in $(cat git.dirs); do
-		grep -qF $pkg cvs.blacklist && continue
+		grep -qxF $pkg cvs.blacklist && continue
 
 		cat git-import/$pkg/.git/cvs-authors || echo $pkg >> cvs.no-autor
 	done | sort -u > git.authors
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/git-migration/pld-git.sh?r1=1.16&r2=1.17&f=u