pld-ftp-admin: shell/bashrc - testmvpkg, mvpkg check signature only when mo...

[glen]

Author: glen                         Date: Thu Aug 28 14:30:23 2008 GMT
Module: pld-ftp-admin                 Tag: HEAD
---- Log message:
- testmvpkg, mvpkg check signature only when moving to PLD repo (arekm)
- remove glen specific aliases (no longer needed)

---- Files affected:
pld-ftp-admin/shell:
   bashrc (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: pld-ftp-admin/shell/bashrc
diff -u pld-ftp-admin/shell/bashrc:1.8 pld-ftp-admin/shell/bashrc:1.9
--- pld-ftp-admin/shell/bashrc:1.8	Fri Feb 15 14:54:05 2008
+++ pld-ftp-admin/shell/bashrc	Thu Aug 28 16:30:18 2008
@@ -6,10 +6,14 @@
 alias dump-locks=~/pld-ftp-admin/scripts/dump-locks.py
 
 testmvpkg() {
+	from="$1"
+	to="$2"
 	~/pld-ftp-admin/scripts/test-move.py "$@" || return $?
 	shift 2
-	echo >&2 "Checking signatures"
-	testsignpkg "$@" || return $?
+	if [ "$to" = "PLD" ]; then
+		echo >&2 "Checking signatures"
+		testsignpkg "$@" || return $?
+	fi
 }
 
 mvpkg() {
@@ -17,7 +21,9 @@
 		shift 2
 		testsignpkg "$@" || return $?
 	}
-	__wrap_signpkg "$@" || return $?
+	if [ "$2" = "PLD" ]; then
+	   	__wrap_signpkg "$@" || return $?
+	fi
 	~/pld-ftp-admin/scripts/move.py "$@" || return $?
 }
 
@@ -28,12 +34,6 @@
 alias df='df -Th'
 alias vi='vim'
 alias h='history $(($LINES-6))'
-
-# glen ;)
-if [ "${SSH_CONNECTION%% *}" = "194.106.120.90" ]; then
-	[ -f ~/okas/bashrc ] && . ~/okas/bashrc
-	[ -x ~/okas/cvsstat ] && alias cvsstat=~/okas/cvsstat
-fi
 
 cp-kde-i18n() {
 	sarch=amd64
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-ftp-admin/shell/bashrc?r1=1.8&r2=1.9&f=u