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 d59ed570303e61b36cd6e0fce63383345a377c05 (commit) via 4a979780914f4666f05522e2c92d44be2cf62b29 (commit) from 06e92db23a1f7b70272abec56e4da73449efde18 (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 d59ed570303e61b36cd6e0fce63383345a377c05 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Wed Jul 14 01:09:39 2010 +0200

Added the latest changes to the core39.

commit 4a979780914f4666f05522e2c92d44be2cf62b29 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Wed Jul 14 01:08:39 2010 +0200

Fixed pakfire error message - this fixes bug #0000688

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

Summary of changes: config/rootfiles/core/39/filelists/files | 1 + config/rootfiles/core/39/update.sh | 6 ++++++ src/pakfire/lib/functions.pl | 2 +- 3 files changed, 8 insertions(+), 1 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/39/filelists/files b/config/rootfiles/core/39/filelists/files index 505310a..68ce835 100644 --- a/config/rootfiles/core/39/filelists/files +++ b/config/rootfiles/core/39/filelists/files @@ -8,3 +8,4 @@ usr/local/bin/updxlratorctrl usr/local/bin/urlfilterctrl srv/web/ipfire/cgi-bin/updatexlrator.cgi srv/web/ipfire/cgi-bin/urlfilter.cgi +/opt/pakfire/lib/functions.pl diff --git a/config/rootfiles/core/39/update.sh b/config/rootfiles/core/39/update.sh index 057a6f4..a54f5b8 100644 --- a/config/rootfiles/core/39/update.sh +++ b/config/rootfiles/core/39/update.sh @@ -23,6 +23,12 @@ # . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Cleanup crontab +cat /var/spool/cron/root.orig | grep -v updatexlrator | grep -v urlfilter > /var/spool/cron/root.orig.temp +mv -f /var/spool/cron/root.orig.temp /var/spool/cron/root.orig +fcrontab -z + # #Stop services

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 5aaa5f4..ba02423 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -220,7 +220,7 @@ sub fetchfile { $allok = 1; return 0; } else { - logger("DOWNLOAD ERROR: Could not open $Conf::cachedir/$bfile for writing."); + logger("DOWNLOAD ERROR: Could not open $Conf::tmpdir/$bfile for writing."); } } else { return 0;

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