From owner-svn-src-user@FreeBSD.ORG Fri Feb 7 13:12:55 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6813CF9D; Fri, 7 Feb 2014 13:12:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 39E281AB0; Fri, 7 Feb 2014 13:12:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s17DCtSp024460; Fri, 7 Feb 2014 13:12:55 GMT (envelope-from uqs@svn.freebsd.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s17DCs3m024458; Fri, 7 Feb 2014 13:12:54 GMT (envelope-from uqs@svn.freebsd.org) Message-Id: <201402071312.s17DCs3m024458@svn.freebsd.org> From: Ulrich Spoerlein Date: Fri, 7 Feb 2014 13:12:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r261587 - user/uqs/git_conv X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Feb 2014 13:12:55 -0000 Author: uqs Date: Fri Feb 7 13:12:54 2014 New Revision: 261587 URL: http://svnweb.freebsd.org/changeset/base/261587 Log: Allow to run the three conversions on different schedules and not all in one go always. Modified: user/uqs/git_conv/git_conv user/uqs/git_conv/git_conv_cron Modified: user/uqs/git_conv/git_conv ============================================================================== --- user/uqs/git_conv/git_conv Fri Feb 7 13:06:48 2014 (r261586) +++ user/uqs/git_conv/git_conv Fri Feb 7 13:12:54 2014 (r261587) @@ -32,10 +32,26 @@ : ${DOC_REPO=/home/svn/doc} : ${PORTS_REPO=/home/svn/ports} -LOCK=/tmp/gitconv.lock -trap 'rm -f ${LOCK} ; exit 1' 1 2 3 15 -if ! shlock -p $$ -f ${LOCK}; then - echo "Locked by `cat ${LOCK}`, running too long? Please fix ..." >&2 +case "$1" in + base) + ;; + ports) + ;; + doc) + ;; + *) + echo "Need to specify which repo to convert" >&2 + exit 1 + ;; +esac + +TYPE=$1 + +LOCK="/tmp/gitconv_${TYPE}.lock" +trap 'rm -f "${LOCK}" ; exit 1' 1 2 3 15 +if ! shlock -p $$ -f "${LOCK}"; then + echo >&2 + echo "Locked by ${TYPE} (`cat "${LOCK}"`), running too long? Please fix ..." >&2 exit 1 fi @@ -97,10 +113,26 @@ gitsvn() done } -gitsvn src-head.git github -gitsvn doc-head.git github -gitsvn ports-head.git github - -svn2git $RULES_DIR/freebsd-base.rules ${SRC_REPO} github bitbucket googlecode -svn2git $RULES_DIR/freebsd-doc.rules ${DOC_REPO} github -svn2git $RULES_DIR/freebsd-ports.rules ${PORTS_REPO} github +case "$TYPE" in + base) + gitsvn src-head.git github + ;; + doc) + gitsvn doc-head.git github + ;; + ports) + gitsvn ports-head.git github + ;; +esac + +case "$TYPE" in + base) + svn2git $RULES_DIR/freebsd-base.rules ${SRC_REPO} github bitbucket googlecode + ;; + doc) + svn2git $RULES_DIR/freebsd-doc.rules ${DOC_REPO} github + ;; + ports) + svn2git $RULES_DIR/freebsd-ports.rules ${PORTS_REPO} github + ;; +esac Modified: user/uqs/git_conv/git_conv_cron ============================================================================== --- user/uqs/git_conv/git_conv_cron Fri Feb 7 13:06:48 2014 (r261586) +++ user/uqs/git_conv/git_conv_cron Fri Feb 7 13:12:54 2014 (r261587) @@ -1,17 +1,30 @@ #!/bin/sh -today="`date +%Y-%m-%d`" -log="$today.log" +case "$1" in + base) + ;; + ports) + ;; + doc) + ;; + *) + echo "Need to specify which repo to convert" >&2 + exit 1 + ;; +esac + +TYPE=$1 +LOG="`date +%Y-%m-%d`_${TYPE}.log" cd /home/git # TODO cleanup old logs -./git_conv >> $log 2>&1 +./git_conv "$@" >> $LOG 2>&1 if [ $? != 0 ]; then echo "Error during git_conv" >&2 - tail -30 $log + tail -30 $LOG exit 1 fi