summaryrefslogtreecommitdiffstats
path: root/web/html/pkgsubmit.php
diff options
context:
space:
mode:
authordsa <dsa>2006-10-13 05:55:58 +0200
committerdsa <dsa>2006-10-13 05:55:58 +0200
commite17a4ceb6ad00bcb51e49d39e5d1a9cd6129352b (patch)
treeb07210aa043844bdd42a0c563838234dce4ce13c /web/html/pkgsubmit.php
parent48a07d401025b55aa1e5b710c7b299bbfd853a0a (diff)
downloadaur-e17a4ceb6ad00bcb51e49d39e5d1a9cd6129352b.tar.gz
aur-e17a4ceb6ad00bcb51e49d39e5d1a9cd6129352b.tar.xz
Solved the #3939 bug and it will require a change in the PackageDepends table to add a DepCondition field with the type varchar(20).
Diffstat (limited to 'web/html/pkgsubmit.php')
-rw-r--r--web/html/pkgsubmit.php16
1 files changed, 12 insertions, 4 deletions
diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php
index 52e23aad..9d54271e 100644
--- a/web/html/pkgsubmit.php
+++ b/web/html/pkgsubmit.php
@@ -87,7 +87,8 @@ if ($_COOKIE["AURSID"]) {
#
$upload_file = $UPLOAD_DIR . $pkg_name;
- if (move_uploaded_file($_FILES["pfile"]["tmp_name"], $upload_file)) {
+
+ if (move_uploaded_file($_FILES["pfile"]["tmp_name"], $upload_file)) {
# ok, we can proceed
#
if (file_exists($INCOMING_DIR . $pkg_name)) {
@@ -427,9 +428,11 @@ if ($_COOKIE["AURSID"]) {
# update package depends
#
$depends = explode(" ", $new_pkgbuild['depends']);
- while (list($k, $v) = each($depends)) {
- $q = "INSERT INTO PackageDepends (PackageID, DepPkgID) VALUES (";
+
+ while (list($k, $v) = each($depends)) {
+ $q = "INSERT INTO PackageDepends (PackageID, DepPkgID, DepCondition) VALUES (";
$deppkgname = preg_replace("/[<>]?=.*/", "", $v);
+ $depcondition = str_replace($deppkgname, "", $v);
# Solve the problem with comments and deps
# added by: dsa <dsandrade@gmail.com>
@@ -437,7 +440,12 @@ if ($_COOKIE["AURSID"]) {
break;
$deppkgid = create_dummy($deppkgname, $_COOKIE['AURSID']);
- $q .= $pdata["ID"].", ".$deppkgid.")";
+
+ if(!empty($depcondition))
+ $q .= $pdata["ID"].", ".$deppkgid.", '".$depcondition."')";
+ else
+ $q .= $pdata["ID"].", ".$deppkgid.", '')";
+
db_query($q, $dbh);
}