From 0eb2997a82b1817124bbfb6986be8058134879ea Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 13 Jan 2008 20:52:44 -0600 Subject: Allow pkgsubmit to accept any tar* file Instead of restricting to gz and bz2, allow just plain tar and any other format tar can understand to be uploaded. I make the mistake all the time of forgetting to pass -z to tar when making something to upload, and there is no real reason to exclude plain tar files. Signed-off-by: Dan McGee --- web/html/pkgsubmit.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'web/html') diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 801348b..ccf66c1 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -47,11 +47,9 @@ if ($_COOKIE["AURSID"]) { $error = __("Could not change directory to %s.", array(UPLOAD_DIR . $tempdir)); } else { - exec("/bin/sh -c 'tar xzf " . $_FILES["pfile"]["tmp_name"] . "'", $trash, $retval); - if ($retval) { - exec("/bin/sh -c 'tar xjf " . $_FILES["pfile"]["tmp_name"] . "'", $trash, $retval); - } - if ($retval) { + # try using general tar. it should take .gz, .bz2, and plain .tar + exec("/bin/sh -c 'tar xf ".$upload_file."'", $trash, $retval); + if (!$retval) { $error = __("Unknown file format for uploaded file."); } } -- cgit v1.2.3-70-g09d2