- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Invert order when sorting packages by age
by Lukas Fleischer 09 Jun '15

09 Jun '15

Fixes FS#44195. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgfuncs.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index b467a3d..a5f24ba 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -677,7 +677,7 @@ function pkg_search_page($SID="") { $q_sort .= "Maintainer " . $order . ", "; break; case 'a': - $q_sort .= "ModifiedTS " . $order . ", "; + $q_sort .= "-ModifiedTS " . $order . ", "; break; default: break; -- 2.4.2

1 0

[aur-dev] [PATCH 1/2] Drop suffixes from confirm parameters
by Lukas Fleischer 09 Jun '15

09 Jun '15

Remove the _delete and _disown suffixes from HTTP POST confirmation parameters. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/account.php | 2 +- web/html/pkgbase.php | 4 ++-- web/html/pkgdel.php | 2 +- web/html/pkgdisown.php | 2 +- web/html/pkgmerge.php | 2 +- web/lib/pkgfuncs.inc.php | 2 +- web/template/account_delete.php | 2 +- web/template/pkg_search_results.php | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/web/html/account.php b/web/html/account.php index cb33c4e..6ecd56e 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -70,7 +70,7 @@ if (isset($_COOKIE["AURSID"])) { /* Details for account being deleted. */ if (can_edit_account($row)) { $UID = $row['ID']; - if (in_request('confirm_Delete') && check_token()) { + if (in_request('confirm') && check_token()) { user_delete($UID); header('Location: /'); } else { diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index 7c24b79..2f8f932 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -54,7 +54,7 @@ if (check_token()) { } elseif (current_action("do_Adopt")) { list($ret, $output) = pkgbase_adopt($ids, true, NULL); } elseif (current_action("do_Disown")) { - if (isset($_POST['confirm_Disown'])) { + if (isset($_POST['confirm'])) { $via = isset($_POST['via']) ? $_POST['via'] : NULL; list($ret, $output) = pkgbase_adopt($ids, false, $via); } else { @@ -66,7 +66,7 @@ if (check_token()) { } elseif (current_action("do_UnVote")) { list($ret, $output) = pkgbase_vote($ids, false); } elseif (current_action("do_Delete")) { - if (isset($_POST['confirm_Delete'])) { + if (isset($_POST['confirm'])) { $via = isset($_POST['via']) ? $_POST['via'] : NULL; if (!isset($_POST['merge_Into']) || empty($_POST['merge_Into'])) { list($ret, $output) = pkgbase_delete($ids, NULL, $via); diff --git a/web/html/pkgdel.php b/web/html/pkgdel.php index 45a3ad4..bad1cd3 100644 --- a/web/html/pkgdel.php +++ b/web/html/pkgdel.php @@ -34,7 +34,7 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?> <?php if (isset($_GET['via'])): ?> <input type="hidden" name="via" value="<?= intval($_GET['via']) ?>" /> <?php endif; ?> - <p><input type="checkbox" name="confirm_Delete" value="1" /> + <p><input type="checkbox" name="confirm" value="1" /> <?= __("Confirm package deletion") ?></p> <p><input type="submit" class="button" name="do_Delete" value="<?= __("Delete") ?>" /></p> </fieldset> diff --git a/web/html/pkgdisown.php b/web/html/pkgdisown.php index d4a3714..50f5c79 100644 --- a/web/html/pkgdisown.php +++ b/web/html/pkgdisown.php @@ -41,7 +41,7 @@ if (has_credential(CRED_PKGBASE_DISOWN, $maintainer_uids)): ?> <?php if (isset($_GET['via'])): ?> <input type="hidden" name="via" value="<?= intval($_GET['via']) ?>" /> <?php endif; ?> - <p><input type="checkbox" name="confirm_Disown" value="1" /> + <p><input type="checkbox" name="confirm" value="1" /> <?= __("Confirm to disown the package") ?></p> <p><input type="submit" class="button" name="do_Disown" value="<?= __("Disown") ?>" /></p> </fieldset> diff --git a/web/html/pkgmerge.php b/web/html/pkgmerge.php index 5fbdbd8..a9c8894 100644 --- a/web/html/pkgmerge.php +++ b/web/html/pkgmerge.php @@ -55,7 +55,7 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?> </script> <p><label for="merge_Into" ><?= __("Merge into:") ?></label> <input type="text" id="merge_Into" name="merge_Into" value="<?= isset($_GET['into']) ? $_GET['into'] : '' ?>" /></p> - <p><input type="checkbox" name="confirm_Delete" value="1" /> + <p><input type="checkbox" name="confirm" value="1" /> <?= __("Confirm package merge") ?></p> <p><input type="submit" class="button" name="do_Delete" value="<?= __("Merge") ?>" /></p> </fieldset> diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 1178550..b467a3d 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -503,7 +503,7 @@ function pkg_display_details($id=0, $row, $SID="") { * do_UnFlag - Remove out-of-date flag * do_Adopt - Adopt * do_Disown - Disown - * do_Delete - Delete (requires confirm_Delete to be set) + * do_Delete - Delete * do_Notify - Enable notification * do_UnNotify - Disable notification */ diff --git a/web/template/account_delete.php b/web/template/account_delete.php index 0d40e5a..03951fe 100644 --- a/web/template/account_delete.php +++ b/web/template/account_delete.php @@ -12,7 +12,7 @@ <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> </fieldset> <fieldset> - <p><input type="checkbox" name="confirm_Delete" value="1" /> + <p><input type="checkbox" name="confirm" value="1" /> <?= __("Confirm deletion") ?></p> <p> diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index e901408..86b4c74 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -122,7 +122,7 @@ if (!$result): ?> <?php if (has_credential(CRED_PKGBASE_DELETE)): ?> <label for="merge_Into"><?= __("Merge into") ?></label> <input type="text" id="merge_Into" name="merge_Into" /> - <input type="checkbox" name="confirm_Delete" value="1" /> <?= __("Confirm") ?> + <input type="checkbox" name="confirm" value="1" /> <?= __("Confirm") ?> <?php endif; ?> <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> <input type="submit" class="button" style="width: 80px" value="<?= __("Go") ?>" /> -- 2.4.2

1 1

[aur-dev] [PATCH] Fix official language name of Czech
by Lukas Fleischer 09 Jun '15

09 Jun '15

Reported-by: Pablo Lezaeta Reyes <prflr88(a)gmail.com> Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/translator.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/translator.inc.php b/web/lib/translator.inc.php index 29bd1b3..416ce66 100644 --- a/web/lib/translator.inc.php +++ b/web/lib/translator.inc.php @@ -21,7 +21,7 @@ global $streamer, $l10n; # Languages we have translations for $SUPPORTED_LANGS = array( "ca" => "Català", - "cs" => "česky", + "cs" => "Český", "da" => "Dansk", "de" => "Deutsch", "en" => "English", -- 2.4.2

1 0

[aur-dev] [PATCH] aurjson.class.php: Exclude hidden package bases
by Lukas Fleischer 09 Jun '15

09 Jun '15

Do not return packages belonging to hidden package bases in RPC results. Fixes FS#45271. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/aurjson.class.php | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 745947e..5fb89a9 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -207,6 +207,7 @@ class AurJSON { "LEFT JOIN Licenses " . "ON Licenses.ID = PackageLicenses.LicenseID " . "WHERE ${where_condition} " . + "AND PackageBases.PackagerUID IS NOT NULL " . "GROUP BY Packages.ID " . "LIMIT $max_results"; } elseif ($this->version >= 2) { @@ -217,6 +218,7 @@ class AurJSON { "LEFT JOIN Users " . "ON PackageBases.MaintainerUID = Users.ID " . "WHERE ${where_condition} " . + "AND PackageBases.PackagerUID IS NOT NULL " . "LIMIT $max_results"; } $result = $this->dbh->query($query); @@ -391,9 +393,13 @@ class AurJSON { * @return string The JSON formatted response data. */ private function suggest($search) { - $query = 'SELECT Name FROM Packages WHERE Name LIKE ' . - $this->dbh->quote(addcslashes($search, '%_') . '%') . - ' ORDER BY Name ASC LIMIT 20'; + $query = "SELECT Packages.Name FROM Packages "; + $query.= "LEFT JOIN PackageBases "; + $query.= "ON PackageBases.ID = Packages.PackageBaseID "; + $query.= "WHERE Packages.Name LIKE "; + $query.= $this->dbh->quote(addcslashes($search, '%_') . '%'); + $query.= " AND PackageBases.PackagerUID IS NOT NULL "; + $query.= "ORDER BY Name ASC LIMIT 20"; $result = $this->dbh->query($query); $result_array = array(); @@ -413,9 +419,10 @@ class AurJSON { * @return string The JSON formatted response data. */ private function suggest_pkgbase($search) { - $query = 'SELECT Name FROM PackageBases WHERE Name LIKE ' . - $this->dbh->quote(addcslashes($search, '%_') . '%') . - ' ORDER BY Name ASC LIMIT 20'; + $query = "SELECT Name FROM PackageBases WHERE Name LIKE "; + $query.= $this->dbh->quote(addcslashes($search, '%_') . '%'); + $query.= " AND PackageBases.PackagerUID IS NOT NULL "; + $query.= "ORDER BY Name ASC LIMIT 20"; $result = $this->dbh->query($query); $result_array = array(); -- 2.4.2

1 0

[aur-dev] [PATCH] git-update: Avoid duplicate notifications
by Lukas Fleischer 08 Jun '15

08 Jun '15

Fixes FS#45254. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- git-interface/git-update.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/git-interface/git-update.py b/git-interface/git-update.py index 215848e..958fa7a 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -144,8 +144,12 @@ def save_srcinfo(srcinfo, db, cur, user): # Add user to notification list on adoption. if was_orphan: - cur.execute("INSERT INTO CommentNotify (PackageBaseID, UserID) " + - "VALUES (%s, %s)", [pkgbase_id, user_id]) + cur.execute("SELECT COUNT(*) FROM CommentNotify WHERE " + + "PackageBaseID = %s AND UserID = %s", + [pkgbase_id, user_id]) + if cur.fetchone()[0] == 0: + cur.execute("INSERT INTO CommentNotify (PackageBaseID, UserID) " + + "VALUES (%s, %s)", [pkgbase_id, user_id]) db.commit() -- 2.4.2

1 0

[aur-dev] [PATCH] Fix searching for an empty string
by Lukas Fleischer 08 Jun '15

08 Jun '15

Return all packages when an empty search term is used with keyword search. Reported-by: G. Schlisio <g.schlisio(a)dukun.de> Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgfuncs.inc.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index ee63e42..1178550 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -602,7 +602,7 @@ function pkg_search_page($SID="") { else { /* Search by name and description (default). */ $count = 0; - $q_where .= "AND ("; + $q_keywords = ""; $op = ""; foreach (str_getcsv($_GET['K'], ' ') as $term) { @@ -623,8 +623,8 @@ function pkg_search_page($SID="") { } $term = "%" . addcslashes($term, '%_') . "%"; - $q_where .= $op . " (Packages.Name LIKE " . $dbh->quote($term) . " OR "; - $q_where .= "Description LIKE " . $dbh->quote($term) . ") "; + $q_keywords .= $op . " (Packages.Name LIKE " . $dbh->quote($term) . " OR "; + $q_keywords .= "Description LIKE " . $dbh->quote($term) . ") "; $count++; if ($count >= 20) { @@ -633,7 +633,9 @@ function pkg_search_page($SID="") { $op = "AND "; } - $q_where .= ") "; + if (!empty($q_keywords)) { + $q_where .= "AND (" . $q_keywords . ") "; + } } } -- 2.4.2

1 0

[aur-dev] [PATCH] pkg_details: Use correct clone URL
by Johannes Löthberg 08 Jun '15

08 Jun '15

The clone URLs should use the pkgbase name, not the pkgname itself Reported-by: Jonathan Steel <jsteel(a)archlinux.org> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- web/template/pkg_details.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index ceece87..14f8847 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -1,8 +1,8 @@ <?php $cgit_uri = config_get('options', 'cgit_uri'); -$git_clone_uri_anon = sprintf(config_get('options', 'git_clone_uri_anon'), htmlspecialchars($row['Name'])); -$git_clone_uri_priv = sprintf(config_get('options', 'git_clone_uri_priv'), htmlspecialchars($row['Name'])); +$git_clone_uri_anon = sprintf(config_get('options', 'git_clone_uri_anon'), htmlspecialchars($row['BaseName'])); +$git_clone_uri_priv = sprintf(config_get('options', 'git_clone_uri_priv'), htmlspecialchars($row['BaseName'])); $uid = uid_from_sid($SID); -- 2.4.2

2 1

[aur-dev] [PATCH] git-update: Drop writing git description file
by Johannes Löthberg 08 Jun '15

08 Jun '15

All PKGBUILDs are stored in a single repository now, so there is no use for writing out a description file for the repo anymore. This fixes a bug where pkgdescs containing UTF-8 characters are rejected due to it trying to write the file out using ASCII. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- git-interface/git-update.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/git-interface/git-update.py b/git-interface/git-update.py index 92953f6..2407188 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -280,9 +280,3 @@ for pkgname in srcinfo.GetPackageNames(): save_srcinfo(srcinfo, db, cur, user) db.close() - -pkglist = list(srcinfo.GetPackageNames()) -if len(pkglist) > 0: - with open(repo_path + '/description', 'w') as f: - pkginfo = srcinfo.GetMergedPackage(pkglist[0]) - f.write(pkginfo['pkgdesc']) -- 2.4.2

2 1

[aur-dev] [PATCH] Fix package statistics
by Lukas Fleischer 08 Jun '15

08 Jun '15

Exclude hidden package bases from the package statistics. Reported-by: Johannes Löthberg <johannes(a)kyriasis.com> Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/stats.inc.php | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/web/lib/stats.inc.php b/web/lib/stats.inc.php index 1dcb9b9..6ca5011 100644 --- a/web/lib/stats.inc.php +++ b/web/lib/stats.inc.php @@ -35,12 +35,17 @@ function updates_table() { * @return void */ function user_table($userid) { - $base_q = "SELECT COUNT(*) FROM PackageBases WHERE MaintainerUID = " . $userid; + $base_q = "SELECT COUNT(*) FROM PackageBases "; + $base_q.= "WHERE MaintainerUID = " . $userid . " "; + $base_q.= "AND PackagerUID IS NOT NULL"; $maintainer_unsupported_count = db_cache_value($base_q, 'user_unsupported_count:' . $userid); - $q = "SELECT COUNT(*) FROM PackageBases WHERE OutOfDateTS IS NOT NULL AND MaintainerUID = " . $userid; + $q = "SELECT COUNT(*) FROM PackageBases "; + $q.= "WHERE OutOfDateTS IS NOT NULL "; + $q.= "AND MaintainerUID = " . $userid . " "; + $q.= "AND PackagerUID IS NOT NULL"; $flagged_outdated = db_cache_value($q, 'user_flagged_outdated:' . $userid); @@ -54,10 +59,12 @@ function user_table($userid) { */ function general_stats_table() { # AUR statistics - $q = "SELECT COUNT(*) FROM PackageBases"; + $q = "SELECT COUNT(*) FROM PackageBases WHERE PackagerUID IS NOT NULL"; $unsupported_count = db_cache_value($q, 'unsupported_count'); - $q = "SELECT COUNT(*) FROM PackageBases WHERE MaintainerUID IS NULL"; + $q = "SELECT COUNT(*) FROM PackageBases "; + $q.= "WHERE MaintainerUID IS NULL "; + $q.= "AND PackagerUID IS NOT NULL"; $orphan_count = db_cache_value($q, 'orphan_count'); $q = "SELECT count(*) FROM Users"; @@ -69,16 +76,27 @@ function general_stats_table() { $targstamp = intval(strtotime("-7 days")); $yearstamp = intval(strtotime("-1 year")); - $q = "SELECT COUNT(*) FROM PackageBases WHERE ModifiedTS >= $targstamp AND ModifiedTS = SubmittedTS"; + $q = "SELECT COUNT(*) FROM PackageBases "; + $q.= "WHERE ModifiedTS >= $targstamp "; + $q.= "AND ModifiedTS = SubmittedTS "; + $q.= "AND PackagerUID IS NOT NULL"; $add_count = db_cache_value($q, 'add_count'); - $q = "SELECT COUNT(*) FROM PackageBases WHERE ModifiedTS >= $targstamp AND ModifiedTS != SubmittedTS"; + $q = "SELECT COUNT(*) FROM PackageBases "; + $q.= "WHERE ModifiedTS >= $targstamp "; + $q.= "AND ModifiedTS != SubmittedTS "; + $q.= "AND PackagerUID IS NOT NULL"; $update_count = db_cache_value($q, 'update_count'); - $q = "SELECT COUNT(*) FROM PackageBases WHERE ModifiedTS >= $yearstamp AND ModifiedTS != SubmittedTS"; + $q = "SELECT COUNT(*) FROM PackageBases "; + $q.= "WHERE ModifiedTS >= $yearstamp "; + $q.= "AND ModifiedTS != SubmittedTS "; + $q.= "AND PackagerUID IS NOT NULL"; $update_year_count = db_cache_value($q, 'update_year_count'); - $q = "SELECT COUNT(*) FROM PackageBases WHERE ModifiedTS = SubmittedTS"; + $q = "SELECT COUNT(*) FROM PackageBases "; + $q.= "WHERE ModifiedTS = SubmittedTS "; + $q.= "AND PackagerUID IS NOT NULL"; $never_update_count = db_cache_value($q, 'never_update_count'); include('stats/general_stats_table.php'); -- 2.4.2

1 0

[aur-dev] [PATCH] Fix bug with extracting sources introduced in c7203066c
by Johannes Löthberg 08 Jun '15

08 Jun '15

In c7203066ce git-update was changed to use extract_arch_fields to get the list of sources instead of looking up them up in the pkginfo dict manually. This was done to solve a bug where only source=() sources were unconditionally checked for, ignoring arch-specific sources. The extract_arch_fields function returns a list of dicts however, so we need to extract the 'value' key from that dict before using it, which was missed in the previous commit. Fixes FS#45261 Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- git-interface/git-update.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-interface/git-update.py b/git-interface/git-update.py index 92953f6..4177e53 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -247,7 +247,8 @@ for commit in walker: die_commit('missing %s file: %s' % (field, pkginfo[field]), commit.id) - for fname in extract_arch_fields(pkginfo, 'source'): + for field in extract_arch_fields(pkginfo, 'source'): + fname = field['value'] if "://" in fname or "lp:" in fname: continue if not fname in commit.tree: -- 2.4.2

2 1