[Pkg-drupal-commits] r1930 - in /branches/drupal-5.0/debian: changelog cron.sh

[luigi at users.alioth.debian.org]

Author: luigi
Date: Wed Oct  8 17:08:13 2008
New Revision: 1930

URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=1930
Log:
Fixed error when BASE_URL is not cleaned (Closes: #494208, #498806)

Modified:
    branches/drupal-5.0/debian/changelog
    branches/drupal-5.0/debian/cron.sh

Modified: branches/drupal-5.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal-5.0/debian/changelog?rev=1930&op=diff
==============================================================================
--- branches/drupal-5.0/debian/changelog (original)
+++ branches/drupal-5.0/debian/changelog Wed Oct  8 17:08:13 2008
@@ -6,6 +6,9 @@
   * debian/po/it.po
     - Updated Italian debconf translation, thanks to Luca Monducci
       (Closes: #494537)
+
+  * debian/cron.sh
+    - Fixed error when BASE_URL is not cleaned (Closes: #494208, #498806)
 
  -- Luigi Gangitano <luigi at debian.org>  Fri,  8 Oct 2008 01:45:38 +0200
 

Modified: branches/drupal-5.0/debian/cron.sh
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal-5.0/debian/cron.sh?rev=1930&op=diff
==============================================================================
--- branches/drupal-5.0/debian/cron.sh (original)
+++ branches/drupal-5.0/debian/cron.sh Wed Oct  8 17:08:13 2008
@@ -1,17 +1,12 @@
 #!/bin/sh
 # $Id$
 
-BASE_URL=""
-
 for site in /etc/drupal/5/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 [ "X$BASE_URL" = "X" ] ; then
-		BASE_URL='http://localhost/drupal5'
-	fi
 
 	curl --silent --compressed --location $BASE_URL/cron.php
 done