[Fusionforge-commits] FusionForge branch 6.0 updated. 385f538 Try pushing the backported *.rpm files to what will become a yum repository later

Roland Mas lolando at libremir.placard.fr.eu.org
Fri Jun 5 15:10:06 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, 6.0 has been updated
       via  385f53806060dfc82b90e1efb08c092e4b1fe11f (commit)
      from  547a4a04fc64ab7df68e4fc6168d90b5b01b8424 (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 385f53806060dfc82b90e1efb08c092e4b1fe11f
Author: Roland Mas <lolando at debian.org>
Date:   Fri Jun 5 15:09:53 2015 +0200

    Try pushing the backported *.rpm files to what will become a yum repository later

diff --git a/autoinstall/common-backports b/autoinstall/common-backports
index 8d2710a..efddd0d 100644
--- a/autoinstall/common-backports
+++ b/autoinstall/common-backports
@@ -93,8 +93,6 @@ function rebuild_one_rpm {
 	done
     fi
 
-    mkdir -p /usr/src/fusionforge/build/RPMS/
-
     if [ $rebuild_needed = yes ] ; then
 	yumdownloader $enablefedsrc --source $src
 
@@ -117,7 +115,6 @@ function rebuild_one_rpm {
 	done
 	for i in $target $others ; do
 	    yum install -y ~/rpmbuild/RPMS/*/$i-[0-9]*.*.rpm || rpm -i ~/rpmbuild/RPMS/*/$i-[0-9]*.*.rpm
-	    cp $i-[0-9]*.*.rpm /usr/src/fusionforge/build/RPMS/
 	done
     else
 	yum install -y $target $others
@@ -268,6 +265,9 @@ EOF
     REMOVEDEPS=$DEPS
     backport_rpm_from_fedora php-htmlpurifier-htmlpurifier
 
+    mkdir -p /usr/src/fusionforge/build/RPMS/
+    cp -r ~/rpmbuild/RPMS/* /usr/src/fusionforge/build/RPMS/
+
     # TODO: postfix: rebuild from RHEL/CentOS sources with pgsql enabled,
     # so we can test mta-postfix
 }

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

Summary of changes:
 autoinstall/common-backports | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/autoinstall/common-backports b/autoinstall/common-backports
index 8d2710a..efddd0d 100644
--- a/autoinstall/common-backports
+++ b/autoinstall/common-backports
@@ -93,8 +93,6 @@ function rebuild_one_rpm {
 	done
     fi
 
-    mkdir -p /usr/src/fusionforge/build/RPMS/
-
     if [ $rebuild_needed = yes ] ; then
 	yumdownloader $enablefedsrc --source $src
 
@@ -117,7 +115,6 @@ function rebuild_one_rpm {
 	done
 	for i in $target $others ; do
 	    yum install -y ~/rpmbuild/RPMS/*/$i-[0-9]*.*.rpm || rpm -i ~/rpmbuild/RPMS/*/$i-[0-9]*.*.rpm
-	    cp $i-[0-9]*.*.rpm /usr/src/fusionforge/build/RPMS/
 	done
     else
 	yum install -y $target $others
@@ -268,6 +265,9 @@ EOF
     REMOVEDEPS=$DEPS
     backport_rpm_from_fedora php-htmlpurifier-htmlpurifier
 
+    mkdir -p /usr/src/fusionforge/build/RPMS/
+    cp -r ~/rpmbuild/RPMS/* /usr/src/fusionforge/build/RPMS/
+
     # TODO: postfix: rebuild from RHEL/CentOS sources with pgsql enabled,
     # so we can test mta-postfix
 }


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list