- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/4] git-update: Move blacklist reading further down
by Lukas Fleischer 16 Aug '15

16 Aug '15

Since c4870a9 (git-update: Only check HEAD for blacklisted packages, 2015-06-04), only the HEAD commit package name is looked up in the blacklist. This means that we no longer need to read the blacklist before running the commit walker. Moving the blacklist reading code further down makes the code easier to read. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- git-interface/git-update.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-interface/git-update.py b/git-interface/git-update.py index 935fa5b..de6ceb4 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -212,9 +212,6 @@ walker = repo.walk(sha1_new, pygit2.GIT_SORT_TOPOLOGICAL) if sha1_old != "0000000000000000000000000000000000000000": walker.hide(sha1_old) -cur.execute("SELECT Name FROM PackageBlacklist") -blacklist = [row[0] for row in cur.fetchall()] - for commit in walker: for fname in ('.SRCINFO', 'PKGBUILD'): if not fname in commit.tree: @@ -293,6 +290,9 @@ pkgbase = srcinfo._pkgbase['pkgname'] cur.execute("SELECT ID FROM PackageBases WHERE Name = %s", [pkgbase]) pkgbase_id = cur.fetchone()[0] +cur.execute("SELECT Name FROM PackageBlacklist") +blacklist = [row[0] for row in cur.fetchall()] + for pkgname in srcinfo.GetPackageNames(): pkginfo = srcinfo.GetMergedPackage(pkgname) pkgname = pkginfo['pkgname'] -- 2.5.0

1 3

[aur-dev] [PATCH] FS#45966 - Outdated translation information
by Stefan Auditor 14 Aug '15

14 Aug '15

Signed-off-by: Stefan Auditor <stefan.auditor(a)erdfisch.de> --- TRANSLATING | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/TRANSLATING b/TRANSLATING index e450640..1a97276 100644 --- a/TRANSLATING +++ b/TRANSLATING @@ -1,12 +1,11 @@ aurweb Translation ================== -This document describes how to create and maintain aurweb translations. It was -originally derived from https://wiki.archlinux.org/index.php/aurweb_Translation +This document describes how to create and maintain aurweb translations. Creating an aurweb translation requires a Transifex (http://www.transifex.com/) account. You will need to register with a translation team on the aurweb -project page (http://www.transifex.com/projects/p/aurweb/) +project page (https://www.transifex.com/lfleischer/aur/) Creating a New Translation -- 2.5.0

2 1

[aur-dev] [PATCH] FS#45643 - [AUR4] Remove autofocus for text input widgets
by Stefan Auditor 12 Aug '15

12 Aug '15

Signed-off-by: Stefan Auditor <stefan.auditor(a)erdfisch.de> --- web/html/login.php | 2 +- web/template/pkg_search_form.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/html/login.php b/web/html/login.php index ab7bac9..4d5918f 100644 --- a/web/html/login.php +++ b/web/html/login.php @@ -29,7 +29,7 @@ html_header('AUR ' . __("Login")); <?php endif; ?> <p> <label for="id_username"><?= __('Username') . ':'; ?></label> - <input id="id_username" type="text" name="user" size="30" maxlength="<?= config_get_int('options', 'username_max_len'); ?>" value="<?php if (isset($_POST['user'])) { print htmlspecialchars($_POST['user'], ENT_QUOTES); } ?>" autofocus="autofocus" /> + <input id="id_username" type="text" name="user" size="30" maxlength="<?= config_get_int('options', 'username_max_len'); ?>" value="<?php if (isset($_POST['user'])) { print htmlspecialchars($_POST['user'], ENT_QUOTES); } ?>" /> </p> <p> <label for="id_password"><?= __('Password') . ':'; ?></label> diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php index 2d03cfa..2cdd100 100644 --- a/web/template/pkg_search_form.php +++ b/web/template/pkg_search_form.php @@ -57,7 +57,7 @@ $per_page = array(50, 100, 250); </div> <div> <label for="id_q"><?= __("Keywords"); ?></label> - <input type='text' name='K' size='30' value="<?php if (isset($_REQUEST["K"])) { print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); } ?>" maxlength='35' autofocus="autofocus" /> + <input type='text' name='K' size='30' value="<?php if (isset($_REQUEST["K"])) { print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); } ?>" maxlength='35' /> </div> <div> <label for="id_out_of_date"><?= __('Out of Date'); ?></label> -- 2.5.0

2 1

[aur-dev] [PATCH] rpc: msearch: Give orphans on empty maintainer argument
by Johannes Löthberg 09 Aug '15

09 Aug '15

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- This is based on the post-4.0.0 branch, though I guess that branch should be merged into master with the 4.0.0 release. web/lib/aurjson.class.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 7d94dab..e102fed 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -437,9 +437,13 @@ class AurJSON { */ private function msearch($http_data) { $maintainer = $http_data['arg']; - $maintainer = $this->dbh->quote($maintainer); - $where_condition = "Users.Username = $maintainer "; + if (empty($maintainer)) { + $where_condition = "Users.ID is NULL"; + } else { + $maintainer = $this->dbh->quote($maintainer); + $where_condition = "Users.Username = $maintainer "; + } return $this->process_query('msearch', $where_condition); } -- 2.5.0

1 0

[aur-dev] aurweb 4.0.0 released
by Lukas Fleischer 08 Aug '15

08 Aug '15

Hello, We are pleased to announce that aurweb 4.0.0 has been released. The official aurweb setup [1] has already been updated. The most exciting change in this release is that Git repositories are now used for AUR packages. This new feature comes along with some other nice additions, such as an SSH interface for registered AUR users. For a comprehensive list of changes, please consult the Git log [2]. As usual, bugs should be reported to the aurweb bug tracker [3]. [1] https://aur.archlinux.org/ [2] https://projects.archlinux.org/aurweb.git/log/?id=v4.0.0 [3] https://bugs.archlinux.org/index.php?project=2

2 1

[aur-dev] [PATCH] git-serve: Add out-of-date status to list-repos
by Johannes Löthberg 08 Aug '15

08 Aug '15

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- Note: I haven't been able to test this due to not having access to my regular laptop, but it should work. git-interface/git-serve.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git-interface/git-serve.py b/git-interface/git-serve.py index 8316cf7..2ee44dc 100755 --- a/git-interface/git-serve.py +++ b/git-interface/git-serve.py @@ -47,10 +47,13 @@ def list_repos(user): if userid == 0: die('{:s}: unknown user: {:s}'.format(action, user)) - cur.execute("SELECT Name, PackagerUID FROM PackageBases " + + cur.execute("SELECT Name, PackagerUID, OutOfDateTS FROM PackageBases " + "WHERE MaintainerUID = %s ", [userid]) for row in cur: - print((' ' if row[1] else '*') + row[0]) + print('{empty}{outofdate}{pkgbase}'.format( + empty=' ' if row[1] else '*', + outofdate=' ' if row[2] else '!', + pkgbase=row[0])) db.close() def create_pkgbase(pkgbase, user): -- 2.4.6

3 7

[aur-dev] [PATCH 1/2] aurinfo: Allow lines starting with spaces
by Johannes Löthberg 04 Aug '15

04 Aug '15

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- git-interface/aurinfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-interface/aurinfo.py b/git-interface/aurinfo.py index 201f864..dfee3c1 100644 --- a/git-interface/aurinfo.py +++ b/git-interface/aurinfo.py @@ -121,7 +121,7 @@ def ParseAurinfoFromIterable(iterable, ecatcher=None): current_package = None continue - if not line.startswith('\t'): + if not (line.startswith('\t') or line.startswith(' ')): # start of new package try: key, value = map(str.strip, line.split('=', 1)) -- 2.5.0

2 2

[aur-dev] .SRCINFO: handling of commits lacking an update and in general
by Peter Mattern 29 Jul '15

29 Jul '15

Hello. Considering the short time AUR 4 is in use the number of commits lacking an update of .SRCINFO seems to be rather high. The resulting problem is a cosmetic one only as the actual PKGBUILD functionality isn't affected but only the package's web page not updated accordingly. Yet I wonder whether it would be helpful to reject commits lacking the update of .SRCINFO if feasible. Actually I wonder as well whether it wouldn't even be better to not have .SRCINFO written by the packagers before uploading a commit but by aurweb when commits are received. This would ensure that problems like the one stated above can't happen and I for one couldn't figure a downside so far. Regards, Peter Mattern

6 10

[aur-dev] [PATCH 1/2] Move documentation to a subdirectory
by Lukas Fleischer 24 Jul '15

24 Jul '15

Create a new subdirectory doc/ that contains documentation. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- AUTHORS | 4 ++-- README | 5 ++++- HACKING => doc/CodingGuidelines | 10 ++++++---- TRANSLATING => doc/i18n.txt | 0 4 files changed, 12 insertions(+), 7 deletions(-) rename HACKING => doc/CodingGuidelines (96%) rename TRANSLATING => doc/i18n.txt (100%) diff --git a/AUTHORS b/AUTHORS index a21fef7..4462cab 100644 --- a/AUTHORS +++ b/AUTHORS @@ -23,8 +23,8 @@ Use `git shortlog -s` for a list of aurweb contributors. Translations ------------ -Our translations are currently maintained in Transifex; please read TRANSLATING -for more details. +Our translations are currently maintained in Transifex; please read +doc/i18n.txt for more details. Below is a list of past translators before we switched to Transifex; more can be found by looking in the Git history. diff --git a/README b/README index 228358a..71e8481 100644 --- a/README +++ b/README @@ -24,6 +24,9 @@ Functionality Directory Layout ---------------- +doc:: + aurweb documentation. + po:: Translation files for strings in the aurweb interface. @@ -40,7 +43,7 @@ Links ----- * The repository is hosted at git://projects.archlinux.org/aurweb.git -- see - HACKING for information on submitting patches. + doc/CodingGuidelines for information on submitting patches. * Discovered bugs can be submitted to the aurweb bug tracker: https://bugs.archlinux.org/index.php?project=2 diff --git a/HACKING b/doc/CodingGuidelines similarity index 96% rename from HACKING rename to doc/CodingGuidelines index 291da1f..46537bb 100644 --- a/HACKING +++ b/doc/CodingGuidelines @@ -1,11 +1,13 @@ -HACKING +Coding Guidelines +================= DISCLAIMER: We realise the code doesn't necessarily follow all the rules. This is an attempt to establish a standard coding style for future development. -Coding style guidelines ------------------------ +Coding style +------------ + Column width: 79 columns or less within reason. Indentation: tabs (standard eight column width) @@ -28,6 +30,7 @@ MySQL queries should generally go into functions. Submitting patches ------------------ + !!! PLEASE TEST YOUR PATCHES BEFORE SUBMITTING !!! Submit uncompressed git-formatted patches to aur-dev(a)archlinux.org. @@ -49,4 +52,3 @@ Glossary git-formatted patch: A patch that is produced via `git format-patch` and is sent via `git send-email` or as an inline attachment of an email. - diff --git a/TRANSLATING b/doc/i18n.txt similarity index 100% rename from TRANSLATING rename to doc/i18n.txt -- 2.4.6

2 2

[aur-dev] [PATCH] aurjson.class.php: Add missing PHPDoc
by Lukas Fleischer 22 Jul '15

22 Jul '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/aurjson.class.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 4e4d5dc..7d94dab 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -139,6 +139,7 @@ class AurJSON { * Returns a JSON formatted result data. * * @param $type The response method type. + * @param $count The number of results to return * @param $data The result data to return * @param $error An error message to include in the response * @@ -159,6 +160,13 @@ class AurJSON { return json_encode($json_array); } + /* + * Get extended package details (for info and multiinfo queries). + * + * @param $pkgid The ID of the package to retrieve details for. + * + * @return array An array containing package details. + */ private function get_extended_fields($pkgid) { $query = "SELECT DependencyTypes.Name AS Type, " . "PackageDepends.DepName AS Name, " . @@ -208,6 +216,15 @@ class AurJSON { return $data; } + /* + * Retrieve package information (used in info, multiinfo, search and + * msearch requests). + * + * @param $type The request type. + * @param $where_condition An SQL WHERE-condition to filter packages. + * + * @return mixed Returns an array of package matches. + */ private function process_query($type, $where_condition) { $max_results = config_get_int('options', 'max_rpc_results'); -- 2.4.6

1 0