[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 89090503c23994368c758a5f9c2e30bf71b607dc

Sylvain Beucler beuc-inria at fusionforge.org
Mon Jun 23 14:35:26 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  89090503c23994368c758a5f9c2e30bf71b607dc (commit)
      from  d63672879fdd068809fedc25e603293ead3adb50 (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 89090503c23994368c758a5f9c2e30bf71b607dc
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Jun 23 14:35:20 2014 +0200

    Fix more cron output

diff --git a/src/CHANGES b/src/CHANGES
index 554b44e..700fbd6 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,9 +1,10 @@
 Fusionforge-5.3.2:
 * Software map: fix "value too long for type character varying(255)" error in cron db_trove_maint.php (Inria)
 * SCM Git: suppress 'warning: You appear to have cloned an empty repository.' in create_scm_repos.php (Inria)
-* SCM Git: handle bad encoding when gathering stats (Inria)
-* Plugin mediawiki: fix paths in import/export scripts (Inria)
+* Stats: handle bad encoding when gathering Git stats, remove spurious warning when SVN repository isn't created yet (Inria)
 * Admin: fix edit table themes, fix frs_processor sequence [#691] (TrivialDev)
+* User SSH keys (ssh_create.php): fix harmless warning when user removes all her keys (Inria)
+* Plugin mediawiki: fix paths in import/export scripts (Inria)
 
 Fusionforge-5.3.1:
 * Docman: Basic Webdav write mkcol support (TrivialDev)
diff --git a/src/cronjobs/ssh_create.php b/src/cronjobs/ssh_create.php
index 3d9cd05..06a8bd7 100755
--- a/src/cronjobs/ssh_create.php
+++ b/src/cronjobs/ssh_create.php
@@ -65,7 +65,7 @@ foreach (array_keys($users) as $user_id)
 
 foreach ($users as $user_id => &$v) {
 	$username = $v['username'];
-	$sshkeys = join("\n", $v['keys']) . "\n";
+	$sshkeys = array_key_exists('keys', $v) ? (join("\n", $v['keys']) . "\n") : '';
 
 	$dir = forge_get_config('homedir_prefix').'/'.$username;
 	if (util_is_root_dir($dir)) {
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php b/src/plugins/scmsvn/common/SVNPlugin.class.php
index 9eaa157..41c15f1 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -430,7 +430,6 @@ class SVNPlugin extends SCMPlugin {
 
 			$repo = forge_get_config('repos_path', 'scmsvn') . '/' . $project->getUnixName();
 			if (!is_dir ($repo) || !is_file ("$repo/format")) {
-				echo "No repository $repo\n";
 				db_rollback();
 				return false;
 			}

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

Summary of changes:
 src/CHANGES                                   |    5 +++--
 src/cronjobs/ssh_create.php                   |    2 +-
 src/plugins/scmsvn/common/SVNPlugin.class.php |    1 -
 3 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list