[Dehs-devel] r185 - in trunk: . www
Raphael Geissert
geissert at alioth.debian.org
Fri Sep 3 17:20:41 UTC 2010
Author: geissert
Date: 2010-09-03 17:20:35 +0000 (Fri, 03 Sep 2010)
New Revision: 185
Modified:
trunk/dehs_pg.php
trunk/www/no_watch.php
Log:
Avoid dpkg errors when upstream's version starts with a dash
Modified: trunk/dehs_pg.php
===================================================================
--- trunk/dehs_pg.php 2010-08-06 19:50:52 UTC (rev 184)
+++ trunk/dehs_pg.php 2010-09-03 17:20:35 UTC (rev 185)
@@ -548,7 +548,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);
}
Modified: trunk/www/no_watch.php
===================================================================
--- trunk/www/no_watch.php 2010-08-06 19:50:52 UTC (rev 184)
+++ trunk/www/no_watch.php 2010-09-03 17:20:35 UTC (rev 185)
@@ -121,7 +121,7 @@
if ($up_vers=='') return 0;
$up_vers = escapeshellarg($up_vers);
$debian_vers = escapeshellarg(vers_conv($debian_vers));
-passthru("dpkg --compare-versions $up_vers le $debian_vers",$great);
+passthru("dpkg --compare-versions -- $up_vers le $debian_vers",$great);
if ($great==0) return 1;
else return 0;
}
More information about the Dehs-devel
mailing list