[Pkg-drupal-commits] r2006 - in /branches/drupal6/debian: changelog cron.sh

[luigi at users.alioth.debian.org]

Author: luigi
Date: Mon Feb 16 19:25:17 2009
New Revision: 2006

URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=2006
Log:
Handle sites/all correctly (Closes: #513522)

Modified:
    branches/drupal6/debian/changelog
    branches/drupal6/debian/cron.sh

Modified: branches/drupal6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/changelog?rev=2006&op=diff
==============================================================================
--- branches/drupal6/debian/changelog (original)
+++ branches/drupal6/debian/changelog Mon Feb 16 19:25:17 2009
@@ -6,6 +6,9 @@
     - Removed security patch integrate upstream
       + 12_SA-2008-073
       + 13_SA-CORE-2009-001
+
+  * debian/cron.sh
+    - Handle sites/all correctly (Closes: #513522)
 
  -- Luigi Gangitano <luigi at debian.org>  Mon, 16 Feb 2009 19:37:31 +0100
 

Modified: branches/drupal6/debian/cron.sh
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/cron.sh?rev=2006&op=diff
==============================================================================
--- branches/drupal6/debian/cron.sh (original)
+++ branches/drupal6/debian/cron.sh Mon Feb 16 19:25:17 2009
@@ -4,14 +4,16 @@
 for site in /etc/drupal/6/sites/* ; do
 	BASE_URL=""
 
-	for file in $site/baseurl.php $site/settings.php; do
-		[ -f "$file" ] && BASE_URL=`grep '^$base_url' $file | cut -d"'" -f2`
-		[ "X$BASE_URL" != "X" ] && break
-	done
+	if [ ! "`basename $site`" = "all" ]; then
+		for file in $site/baseurl.php $site/settings.php; do
+			[ -f "$file" ] && BASE_URL=`grep '^$base_url' $file | cut -d"'" -f2`
+			[ "X$BASE_URL" != "X" ] && break
+		done
 
-	if [ "X$BASE_URL" = "X" ] ; then
-		BASE_URL='http://localhost/drupal6'
+		if [ "X$BASE_URL" = "X" ] ; then
+			BASE_URL='http://localhost/drupal6'
+		fi
+
+		curl --silent --compressed --location $BASE_URL/cron.php
 	fi
-
-	curl --silent --compressed --location $BASE_URL/cron.php
 done