git-migration: pld-git.sh - skip CVS false positive for package name - remo...

[glen]

Author: glen                         Date: Thu Feb 10 05:38:11 2011 GMT
Module: git-migration                 Tag: HEAD
---- Log message:
- skip CVS false positive for package name
- remove imported pkg from cvs.pkgs
- move git cvsimport related actions to itfunction

---- Files affected:
git-migration:
   pld-git.sh (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: git-migration/pld-git.sh
diff -u git-migration/pld-git.sh:1.20 git-migration/pld-git.sh:1.21
--- git-migration/pld-git.sh:1.20	Thu Feb 10 06:09:26 2011
+++ git-migration/pld-git.sh	Thu Feb 10 06:38:06 2011
@@ -42,6 +42,8 @@
 		for pkg in $CVSROOT/packages/*/; do
 			pkg=${pkg%/}
 			pkg=${pkg##*/}
+			# skip fp
+			[ "$pkg" = "CVS" ] && continue
 			echo $pkg
 		done > cvs.dirs
 	else
@@ -127,6 +129,9 @@
 		> $GIT_DIR/description
 		rm -f $GIT_DIR/hooks/*
 		unset GIT_DIR
+
+		# remove from cvs.pkgs to mark it done (for this round)
+		sed -i -e "/^$pkg\$/d" cvs.pkgs
 	done
 }
 
@@ -155,6 +160,11 @@
 			exit 1
 		}
 	done
+
+	git_rewrite_commitlogs "$@"
+
+	# do not need bare repo, if all we do is push to github
+#	git_bare "$@"
 }
 
 # rewrite commit logs
@@ -266,15 +276,10 @@
 	touch git.users
 }
 
-
 cvs_rsync
 
 #import_git-cvsimport "$@"
 import_cvs2git "$@"
-#git_rewrite_commitlogs "$@"
 
 # missingusers needed only to analyze missing users file
 #git_missingusers
-
-# do not need bare repo, if all we do is push to github
-#git_bare "$@"
================================================================

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