From 745d49ebe0ad7c77f0eb34f563be6d0bdb52b181 Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Sun, 11 May 2014 17:42:30 +0400 Subject: [PATCH] Do not link repositories by projects.identifier because it cann't be changed. --- gitorious_chiliproject.sh | 3 +-- rhodecode_chiliproject.sh | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gitorious_chiliproject.sh b/gitorious_chiliproject.sh index 5102c61..122b3ef 100755 --- a/gitorious_chiliproject.sh +++ b/gitorious_chiliproject.sh @@ -48,8 +48,7 @@ CHILI_ID_GITORIOUS_REPO=`mysql --default-character-set=utf8 -h$MYSQL_HOSTNAME -u AND $CHILI_MYSQL_DBNAME.member_roles.role_id=$CHILI_MYSQL_DBNAME.roles.id AND $CHILI_MYSQL_DBNAME.members.user_id=$CHILI_MYSQL_DBNAME.users.id AND $CHILI_MYSQL_DBNAME.members.project_id=$CHILI_MYSQL_DBNAME.projects.id - AND ($CHILI_MYSQL_DBNAME.projects.name=$GITORIOUS_MYSQL_DBNAME.repositories.name - OR $CHILI_MYSQL_DBNAME.projects.identifier=$GITORIOUS_MYSQL_DBNAME.repositories.name) + AND $CHILI_MYSQL_DBNAME.projects.name=$GITORIOUS_MYSQL_DBNAME.repositories.name AND $CHILI_MYSQL_DBNAME.users.type='User' AND $CHILI_MYSQL_DBNAME.users.mail=$GITORIOUS_MYSQL_DBNAME.users.email AND $CHILI_MYSQL_DBNAME.roles.name IN ($roles_mysql_string) diff --git a/rhodecode_chiliproject.sh b/rhodecode_chiliproject.sh index 34411e5..efc33de 100755 --- a/rhodecode_chiliproject.sh +++ b/rhodecode_chiliproject.sh @@ -74,8 +74,7 @@ for i in `seq 0 $((nrepos-1))`; do [ "$USERID" == "" ] && continue PROJECTID=`mysql -h$CHILI_MYSQL_HOSTNAME -u $CHILI_MYSQL_USER -e "SELECT DISTINCT id FROM $CHILI_MYSQL_DBNAME.projects - WHERE (name='${repos_names[$i]}' - OR identifier='${repos_names[$i]}') + WHERE name='${repos_names[$i]}' AND status='1'" \ | grep -v tables_col|xargs|sed "s/ /\n/g"|tail -n+2` [ "$PROJECTID" == "" ] && continue