[Fusionforge-commits] FusionForge branch master updated. 9bb58dc Merge branch '6.0'

Roland Mas lolando at libremir.placard.fr.eu.org
Wed Jun 3 10:15:58 CEST 2015


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, master has been updated
       via  9bb58dc8ea375c42b8fe32adcde27c97e71915d2 (commit)
       via  cec32f593ab274213e0e0907ee672ba11d1be37f (commit)
       via  9c9b0867d24475ed90f4c5eda1ca9038067822aa (commit)
       via  d51dc71de442041afe83b18443d9a18166ade581 (commit)
       via  374878c765e85f1c0509ea0309da875476a0b564 (commit)
       via  47f7c9bf97f911694600a320c5596af8a3979549 (commit)
       via  c5a26fd16764e9cde1fb782552dcae0d13838b97 (commit)
      from  3b6055febe88a40098e16e6ac25f2d563da64a47 (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 9bb58dc8ea375c42b8fe32adcde27c97e71915d2
Merge: 3b6055f cec32f5
Author: Roland Mas <lolando at debian.org>
Date:   Wed Jun 3 10:08:35 2015 +0200

    Merge branch '6.0'


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

Summary of changes:
 src/common/include/system/pgsql.class.php                         | 2 +-
 src/common/widget/Widget_MyProjects.class.php                     | 1 +
 .../library/scmgit/hooks/postreceiveemail/post-receive-email      | 8 +++++++-
 src/www/project/request.php                                       | 2 +-
 tests/buildbot/push-packages-to-repositories.sh                   | 6 +++++-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/common/include/system/pgsql.class.php b/src/common/include/system/pgsql.class.php
index 11c2924..c45f54d 100644
--- a/src/common/include/system/pgsql.class.php
+++ b/src/common/include/system/pgsql.class.php
@@ -503,7 +503,7 @@ FROM users
   JOIN pfo_role ON (pfo_user_role.role_id=pfo_role.role_id)
   LEFT JOIN role_project_refs ON (pfo_user_role.role_id=role_project_refs.role_id)
   JOIN nss_groups ON (pfo_role.home_group_id=nss_groups.group_id OR role_project_refs.group_id=nss_groups.group_id)
-  JOIN pfo_role_setting ON (pfo_user_role.role_id=pfo_role_setting.role_id AND (pfo_role_setting.ref_id=nss_groups.group_id) AND ((section_name='project_admin' AND perm_val=1) OR (section_name='scm' AND perm_val=1)))
+  JOIN pfo_role_setting ON (pfo_user_role.role_id=pfo_role_setting.role_id AND (pfo_role_setting.ref_id=nss_groups.group_id) AND ((section_name='project_admin' AND perm_val=1) OR (section_name='scm' AND perm_val>=1)))
 WHERE users.unix_status='A' AND nss_groups.gid > $2
 
 UNION
diff --git a/src/common/widget/Widget_MyProjects.class.php b/src/common/widget/Widget_MyProjects.class.php
index 64f01f0..171d367 100644
--- a/src/common/widget/Widget_MyProjects.class.php
+++ b/src/common/widget/Widget_MyProjects.class.php
@@ -55,6 +55,7 @@ class Widget_MyProjects extends Widget {
 			$i = 0;
 			$ra = RoleAnonymous::getInstance();
 			foreach ($groups as $g) {
+				if ($g->getStatus() != 'A') continue;
 				$i++;
 				$html_my_projects .= '
 				<tr '. $HTML->boxGetAltRowStyle($i) .'><td style="width:99%">'.
diff --git a/src/plugins/scmhook/library/scmgit/hooks/postreceiveemail/post-receive-email b/src/plugins/scmhook/library/scmgit/hooks/postreceiveemail/post-receive-email
index 8cc5686..91836b1 100755
--- a/src/plugins/scmhook/library/scmgit/hooks/postreceiveemail/post-receive-email
+++ b/src/plugins/scmhook/library/scmgit/hooks/postreceiveemail/post-receive-email
@@ -282,6 +282,12 @@ generate_email_header()
 	test -n "$envelopesender" && routing_headers="From: $envelopesender${nl}$routing_headers"
 	test -n "$replyto" && routing_headers="$routing_headers${nl}Reply-To: $replyto"
 
+	subj="Subject: ${emailprefix}$shortdesc $refname_type $short_refname ${change_type}d. $(git show --no-patch --format='%h %s' $newrev)"
+	subj=$(print -nr -- "$subj" | php -r '
+mb_internal_encoding("UTF-8");
+echo mb_encode_mimeheader(file_get_contents("php://stdin"),
+"UTF-8", "Q", "\012");')
+	
 	cat <<-EOF
 	MIME-Version: 1.0
 	Content-Type: text/plain; charset=UTF-8
@@ -291,7 +297,7 @@ generate_email_header()
 	X-Git-Reftype: $refname_type
 	X-Git-Oldrev: $oldrev
 	X-Git-Newrev: $newrev
-	$(perl -Mutf8 -MEncode -e "print encode('MIME-Q', 'Subject: ${emailprefix}$shortdesc $refname_type $short_refname ${change_type}d. '.qx/git show --no-patch --format='%h %s' $newrev/);")
+        $subj
 	Auto-Submitted: auto-generated
 
 	This is an automated email from the git hooks/post-receive script. It was
diff --git a/src/www/project/request.php b/src/www/project/request.php
index ce8d7a9..3b01557 100644
--- a/src/www/project/request.php
+++ b/src/www/project/request.php
@@ -61,7 +61,7 @@ $nbadmins = count($group->getAdmins());
 echo html_e('p', array(), ngettext('You can request to join a project by clicking the submit button. The administrator will be emailed to approve or deny your request.', 'You can request to join a project by clicking the submit button. The administrators will be emailed to approve or deny your request.', $nbadmins));
 echo $HTML->openForm(array('action' => getStringFromServer('PHP_SELF').'?group_id='.$group_id, 'method' => 'post'));
 echo html_e('p', array(), ngettext('You must send a comment to the administrator:', 'You must send a comment to the administrators:',$nbadmins).utils_requiredField());
-echo html_e('textarea', array('name' => 'comments', 'required' => 'required', 'rows' => 15, 'cols' => 60), $comments);
+echo html_e('textarea', array('name' => 'comments', 'required' => 'required', 'rows' => 15, 'cols' => 60), $comments, false);
 echo html_e('p', array(), html_e('input', array('type' => 'submit', 'name' => 'submit', 'value' => _('Submit'))));
 echo $HTML->closeForm();
 echo $HTML->addRequiredFieldsInfoBox();
diff --git a/tests/buildbot/push-packages-to-repositories.sh b/tests/buildbot/push-packages-to-repositories.sh
index f0f68c9..0f96867 100755
--- a/tests/buildbot/push-packages-to-repositories.sh
+++ b/tests/buildbot/push-packages-to-repositories.sh
@@ -36,9 +36,13 @@ case $method in
     deb)
 	cd $WORKSPACE/packages/
 	sed -i -e "s/^Distribution:.*/Distribution: $dist-$branch/" fusionforge*changes
-	dput fforg fusionforge*changes
+	debsign -m"FusionForge buildbot" *changes
+	dput buildbot fusionforge*changes
+	rsync -av --delete-after /var/lib/jenkins/deb/ ffbuildbot at fusionforge.org:/home/groups/fusionforge/htdocs/deb/
 	;;
     rpm)
+	rpmsign --addsign $WORKSPACE/packages/noarch/*.rpm
+	gpg --detach-sign --armor $WORKSPACE/packages/repodata/repomd.xml
 	rsync -av --delete $WORKSPACE/packages/ ffbuildbot at fusionforge.org:/home/groups/fusionforge/htdocs/rpm/$dist-$branch/
 	;;
     *)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list