[Dehs-devel] r119 - trunk

atomo64-guest at alioth.debian.org atomo64-guest at alioth.debian.org
Sun Mar 16 21:30:29 UTC 2008


Author: atomo64-guest
Date: 2008-03-16 21:30:28 +0000 (Sun, 16 Mar 2008)
New Revision: 119

Modified:
   trunk/dehs.sh
   trunk/dehs_pg.php
Log:
dehs.sh: retry the execution of update_wwwal.sh (because of recent AUTH problems)
dehs_pg.php: fix escaping when calling dpkg --compare-versions


Modified: trunk/dehs.sh
===================================================================
--- trunk/dehs.sh	2008-03-02 23:30:47 UTC (rev 118)
+++ trunk/dehs.sh	2008-03-16 21:30:28 UTC (rev 119)
@@ -68,6 +68,6 @@
 fi
 
 $WORKDIR/dehs_pg.php $run_type >$WORKDIR/logs/stdout.log
-$WORKDIR/update_wwwal.sh >/dev/null
+$WORKDIR/update_wwwal.sh >/dev/null || $WORKDIR/update_wwwal.sh >/dev/null
 
 rm $LOCK

Modified: trunk/dehs_pg.php
===================================================================
--- trunk/dehs_pg.php	2008-03-02 23:30:47 UTC (rev 118)
+++ trunk/dehs_pg.php	2008-03-16 21:30:28 UTC (rev 119)
@@ -460,7 +460,7 @@
         $extendedConv = false;
     }
 
-    passthru("dpkg --compare-versions '".escapeshellarg($up_vers)."' le '" . escapeshellarg($dversionAsIs?$debian_vers:vers_conv($debian_vers, $extendedConv)) . "'",$great);
+    passthru("dpkg --compare-versions ".escapeshellarg($up_vers)." le " . escapeshellarg($dversionAsIs?$debian_vers:vers_conv($debian_vers, $extendedConv)),$great);
 
     return (int)!($great);
 }




More information about the Dehs-devel mailing list