[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 21b2cf003045d2580eb8916744147fba68b6a2c5

Sylvain Beucler beuc-inria at fusionforge.org
Wed Apr 30 16:08:38 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, Branch_5_3 has been updated
       via  21b2cf003045d2580eb8916744147fba68b6a2c5 (commit)
      from  dd7b29358d237e51ea27429f515925c899cc9d95 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 21b2cf003045d2580eb8916744147fba68b6a2c5
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Apr 30 16:08:09 2014 +0200

    20120610-migrate-sshkeys.php: don't overwrite $res, or it will only migrate one (1) key

diff --git a/src/db/20120610-migrate-sshkeys.php b/src/db/20120610-migrate-sshkeys.php
old mode 100644
new mode 100755
index c808943..2b7d718
--- a/src/db/20120610-migrate-sshkeys.php
+++ b/src/db/20120610-migrate-sshkeys.php
@@ -51,16 +51,16 @@ while($row = db_fetch_array($res)) {
 		$fingerprint = $returnExecExploded[1];
 		$now = time();
 		$explodedKey = explode(' ', $key);
-		$res = db_query_params('insert into sshkeys (userid, fingerprint, upload, sshkey, name, algorithm)
+		$res_insert = db_query_params('insert into sshkeys (userid, fingerprint, upload, sshkey, name, algorithm)
 							values ($1, $2, $3, $4, $5, $6)',
 					array($row['user_id'], $fingerprint, $now, $key, $explodedKey[2], $explodedKey[0]));
-		if (!$res) {
+		if (!$res_insert) {
 			echo 'UPGRADE ERROR: '.db_error();
 			db_rollback();
 			exit(1);
 		}
 	}
-	$res = db_query_params('update users set authorized_keys = $1 where user_id = $2',
+	db_query_params('update users set authorized_keys = $1 where user_id = $2',
 				array('', $row['user_id']));
 }
 db_commit();

-----------------------------------------------------------------------

Summary of changes:
 src/db/20120610-migrate-sshkeys.php |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 src/db/20120610-migrate-sshkeys.php


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list