kolan
/
Redmine-Integration
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for repositories with duplicate names/identifiers.

This commit is contained in:
Kolan Sh 2014-05-11 17:27:14 +04:00
parent 8d54ced76b
commit 066e42523e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gitorious_chiliproject.sh
View File

@ -68,7 +68,7 @@ for v in $CHILI_ID_GITORIOUS_REPO; do
# Test for already present repo # Test for already present repo
ALREADY_EXIST=`mysql -h$MYSQL_HOSTNAME -u $MYSQL_USER -e "SELECT id ALREADY_EXIST=`mysql -h$MYSQL_HOSTNAME -u $MYSQL_USER -e "SELECT id
FROM $CHILI_MYSQL_DBNAME.repositories FROM $CHILI_MYSQL_DBNAME.repositories
WHERE project_id=$chili_project_id WHERE project_id='$chili_project_id'
OR url='$gitorious_path' OR url='$gitorious_path'
OR root_url='$gitorious_path'" \ OR root_url='$gitorious_path'" \
| grep -v tables_col|xargs|sed "s/ /\n/g"|tail -n+2` | grep -v tables_col|xargs|sed "s/ /\n/g"|tail -n+2`

4
rhodecode_chiliproject.sh
View File

@ -73,7 +73,7 @@ for i in `seq 0 $((nrepos-1))`; do
| grep -v tables_col|xargs|sed "s/ /\n/g"|tail -n+2` | grep -v tables_col|xargs|sed "s/ /\n/g"|tail -n+2`
[ "$USERID" == "" ] && continue [ "$USERID" == "" ] && continue
PROJECTID=`mysql -h$CHILI_MYSQL_HOSTNAME -u $CHILI_MYSQL_USER -e "SELECT id FROM $CHILI_MYSQL_DBNAME.projects PROJECTID=`mysql -h$CHILI_MYSQL_HOSTNAME -u $CHILI_MYSQL_USER -e "SELECT DISTINCT id FROM $CHILI_MYSQL_DBNAME.projects
WHERE (name='${repos_names[$i]}' WHERE (name='${repos_names[$i]}'
OR identifier='${repos_names[$i]}') OR identifier='${repos_names[$i]}')
AND status='1'" \ AND status='1'" \
@ -82,7 +82,7 @@ for i in `seq 0 $((nrepos-1))`; do
ALREADY_EXIST=`mysql -h$CHILI_MYSQL_HOSTNAME -u $CHILI_MYSQL_USER -e "SELECT id ALREADY_EXIST=`mysql -h$CHILI_MYSQL_HOSTNAME -u $CHILI_MYSQL_USER -e "SELECT id
FROM $CHILI_MYSQL_DBNAME.repositories FROM $CHILI_MYSQL_DBNAME.repositories
WHERE project_id=$PROJECTID WHERE project_id='$PROJECTID'
OR url='${repos_paths[$i]}' OR url='${repos_paths[$i]}'
OR root_url='${repos_paths[$i]}'" \ OR root_url='${repos_paths[$i]}'" \
| grep -v tables_col|xargs|sed "s/ /\n/g"|tail -n+2` | grep -v tables_col|xargs|sed "s/ /\n/g"|tail -n+2`