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 "IPFire 2.x development tree".

The branch, master has been updated via 8afe69f7464c4a405e91d3fd2f77512d151dba15 (commit) via 25dea62ac0410f129840a752544040abd7182953 (commit) via 7bd26c33c169474ac56f5a7c667d07adb4484c4d (commit) from 7b7479628827354a5ce6b91e3a0b91af02d4b5a8 (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 8afe69f7464c4a405e91d3fd2f77512d151dba15 Merge: 7b7479628827354a5ce6b91e3a0b91af02d4b5a8 25dea62ac0410f129840a752544040abd7182953 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jan 29 00:13:12 2010 +0100

Merge branch 'core36'

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

Summary of changes: config/rootfiles/common/openssl | 2 +- html/cgi-bin/pakfire.cgi | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)

Difference in files: diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl index 1dc51cf..016e841 100644 --- a/config/rootfiles/common/openssl +++ b/config/rootfiles/common/openssl @@ -9,7 +9,7 @@ #etc/ssl/misc/c_name etc/ssl/openssl.cnf #etc/ssl/private -#usr/bin/c_rehash +usr/bin/c_rehash usr/bin/openssl #usr/include/openssl #usr/include/openssl/aes.h diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 8f20d57..ca7a4ad 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -62,6 +62,7 @@ if ($pakfiresettings{'ACTION'} eq 'install'){ if ("$pakfiresettings{'FORCE'}" eq "on") { my $command = "/usr/local/bin/pakfire install --non-interactive --no-colors $pakfiresettings{'INSPAKS'} &>/dev/null &"; system("$command"); + system("/bin/sleep 1"); } else { &Header::openbox("100%", "center", "Abfrage"); my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'INSPAKS'}`; @@ -101,6 +102,7 @@ END if ("$pakfiresettings{'FORCE'}" eq "on") { my $command = "/usr/local/bin/pakfire remove --non-interactive --no-colors $pakfiresettings{'DELPAKS'} &>/dev/null &"; system("$command"); + system("/bin/sleep 1"); } else { &Header::openbox("100%", "center", "Abfrage"); my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'DELPAKS'}`; @@ -138,10 +140,11 @@ END } elsif ($pakfiresettings{'ACTION'} eq 'update') {

system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null &"); - + system("/bin/sleep 1"); } elsif ($pakfiresettings{'ACTION'} eq 'upgrade') { my $command = "/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null &"; system("$command"); + system("/bin/sleep 1"); } elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") {

if ($pakfiresettings{'AUTOUPDATE'} eq 'on') {

hooks/post-receive -- IPFire 2.x development tree