- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] t1200: Test maintenance mode
by Lukas Fleischer 25 Dec '16

25 Dec '16

Add a test case to ensure that enabling the maintenance mode disables the SSH interface. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- test/t1200-git-serve.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/t1200-git-serve.sh b/test/t1200-git-serve.sh index 5054ce3..6fa6f95 100755 --- a/test/t1200-git-serve.sh +++ b/test/t1200-git-serve.sh @@ -20,6 +20,17 @@ test_expect_success 'Test help.' ' IFS=$save_IFS ' +test_expect_success 'Test maintenance mode.' ' + mv config config.old && + sed "s/^$enable-maintenance = $0$/\\11/" config.old >config && + SSH_ORIGINAL_COMMAND=help test_must_fail "$GIT_SERVE" 2>actual && + cat >expected <<-EOF && + The AUR is down due to maintenance. We will be back soon. + EOF + test_cmp expected actual && + mv config.old config +' + test_expect_success 'Test setup-repo and list-repos.' ' SSH_ORIGINAL_COMMAND="setup-repo foobar" AUR_USER=user \ "$GIT_SERVE" 2>&1 && -- 2.11.0

1 0

[aur-dev] [PATCH] notify: Avoid EXCEPT in SQL statement
by Lukas Fleischer 12 Dec '16

12 Dec '16

Do not use the EXCEPT clause which is unsupported in MySQL. Instead, use a subquery which is standard-compliant and makes the query easier to read at the same time. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- aurweb/scripts/notify.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py index 8fdfeb9..69164fb 100755 --- a/aurweb/scripts/notify.py +++ b/aurweb/scripts/notify.py @@ -139,12 +139,10 @@ def get_request_recipients(conn, reqid): def get_tu_vote_reminder_recipients(conn, vote_id): - cur = conn.execute('SELECT Users.Email FROM Users ' + - 'WHERE AccountTypeID = 2 ' + - 'EXCEPT SELECT Users.Email FROM Users ' + - 'INNER JOIN TU_Votes ' + - 'ON TU_Votes.UserID = Users.ID ' + - 'WHERE TU_Votes.VoteID = ?', [vote_id]) + cur = conn.execute('SELECT Email FROM Users ' + + 'WHERE AccountTypeID = 2 AND ID NOT IN ' + + '(SELECT UserID FROM TU_Votes ' + + 'WHERE TU_Votes.VoteID = ?)', [vote_id]) return [row[0] for row in cur.fetchall()] -- 2.10.2

1 0

[aur-dev] [PATCH 1/2] Send out-of-date notifications to co-maintainers
by Lukas Fleischer 13 Nov '16

13 Nov '16

Currently, only package maintainers receive out-of-date notifications for their packages. Add package base co-maintainers to the list of recipients for out-of-date notifications. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- aurweb/scripts/notify.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py index ddd6e49..8fdfeb9 100755 --- a/aurweb/scripts/notify.py +++ b/aurweb/scripts/notify.py @@ -73,12 +73,15 @@ def get_user_email(conn, uid): return cur.fetchone()[0] -def get_maintainer_email(conn, pkgbase_id): - cur = conn.execute('SELECT Users.Email FROM Users ' + +def get_flag_recipients(conn, pkgbase_id): + cur = conn.execute('SELECT DISTINCT Users.Email FROM Users ' + + 'LEFT JOIN PackageComaintainers ' + + 'ON PackageComaintainers.UsersID = Users.ID ' + 'INNER JOIN PackageBases ' + - 'ON PackageBases.MaintainerUID = Users.ID WHERE ' + - 'PackageBases.ID = ?', [pkgbase_id]) - return cur.fetchone()[0] + 'ON PackageBases.MaintainerUID = Users.ID OR ' + + 'PackageBases.ID = PackageComaintainers.PackageBaseID ' + + 'WHERE PackageBases.ID = ?', [pkgbase_id]) + return [row[0] for row in cur.fetchall()] def get_recipients(conn, pkgbase_id, uid): @@ -247,7 +250,7 @@ def update(conn, uid, pkgbase_id): def flag(conn, uid, pkgbase_id): user = username_from_id(conn, uid) pkgbase = pkgbase_from_id(conn, pkgbase_id) - to = [get_maintainer_email(conn, pkgbase_id)] + to = get_flag_recipients(conn, pkgbase_id) text = get_flagger_comment(conn, pkgbase_id) user_uri = aur_location + '/account/' + user + '/' -- 2.10.2

1 1

[aur-dev] [PATCH] test/setup.sh: Fix script paths
by Lukas Fleischer 13 Nov '16

13 Nov '16

The scripts were moved to aurweb/scripts/ in commit 3718860 (Make maintenance scripts installable, 2016-10-17). Update the paths in the test suite accordingly. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- test/setup.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/setup.sh b/test/setup.sh index d02d298..26873e8 100644 --- a/test/setup.sh +++ b/test/setup.sh @@ -11,11 +11,11 @@ export PYTHONPATH GIT_AUTH="$TOPLEVEL/aurweb/git/auth.py" GIT_SERVE="$TOPLEVEL/aurweb/git/serve.py" GIT_UPDATE="$TOPLEVEL/aurweb/git/update.py" -MKPKGLISTS="$TOPLEVEL/scripts/mkpkglists.py" -TUVOTEREMINDER="$TOPLEVEL/scripts/tuvotereminder.py" -PKGMAINT="$TOPLEVEL/scripts/pkgmaint.py" -AURBLUP="$TOPLEVEL/scripts/aurblup.py" -NOTIFY="$TOPLEVEL/scripts/notify.py" +MKPKGLISTS="$TOPLEVEL/aurweb/scripts/mkpkglists.py" +TUVOTEREMINDER="$TOPLEVEL/aurweb/scripts/tuvotereminder.py" +PKGMAINT="$TOPLEVEL/aurweb/scripts/pkgmaint.py" +AURBLUP="$TOPLEVEL/aurweb/scripts/aurblup.py" +NOTIFY="$TOPLEVEL/aurweb/scripts/notify.py" # Create the configuration file and a dummy notification script. cat >config <<-EOF -- 2.10.2

1 0

[aur-dev] [PATCH] Fix DB.class.php to match config
by Mark Weiman 11 Nov '16

11 Nov '16

In commit baf8a220, conf/config.proto was changed so that dsn_prefix was changed to backend and this fixes this in web/lib/DB.class.php. Signed-off-by: Mark Weiman <mark.weiman(a)markzz.com> --- web/lib/DB.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/lib/DB.class.php b/web/lib/DB.class.php index b538e0d..f6fd7ad 100644 --- a/web/lib/DB.class.php +++ b/web/lib/DB.class.php @@ -17,14 +17,14 @@ class DB { public static function connect() { if (self::$dbh === null) { try { - $dsn_prefix = config_get('database', 'dsn_prefix'); + $backend = config_get('database', 'backend'); $host = config_get('database', 'host'); $socket = config_get('database', 'socket'); $name = config_get('database', 'name'); $user = config_get('database', 'user'); $password = config_get('database', 'password'); - $dsn = $dsn_prefix . + $dsn = $backend . ':host=' . $host . ';unix_socket=' . $socket . ';dbname=' . $name; -- 2.10.2

2 6

[aur-dev] [PATCH] Remove extraneous quote in translator.inc.php
by Mark Weiman 10 Nov '16

10 Nov '16

The quote is a leftover of legacy code and was meant to be removed by commit e171f6f (Migrate all DB code to use PDO, 2012-08-08). Signed-off-by: Mark Weiman <mark.weiman(a)markzz.com> --- 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 d53bd53..58648c4 100644 --- a/web/lib/translator.inc.php +++ b/web/lib/translator.inc.php @@ -106,7 +106,7 @@ function set_lang() { $dbh = DB::connect(); $q = "SELECT LangPreference FROM Users, Sessions "; $q.= "WHERE Users.ID = Sessions.UsersID "; - $q.= "AND Sessions.SessionID = '"; + $q.= "AND Sessions.SessionID = "; $q.= $dbh->quote($_COOKIE["AURSID"]); $result = $dbh->query($q); -- 2.10.2

1 0

Re: [aur-dev] [aur-general] Missing Co-Maintainer Search Criteria on AUR
by Eli Schwartz 06 Nov '16

06 Nov '16

On 11/05/2016 04:55 AM, Lukas Fleischer wrote: > I actually wanted to implement this a while ago but deferred it because > I had problems finding a good UI. The two straightforward options are: > > 1. Adjust the maintainer filter such that it also looks for > co-maintainers... Which would essentially result in packages you > co-maintain being listed under "My Packages". > > 2. Add a new co-maintainer filter. Then, in addition to "My Packages", > add a "Packages I Co-Maintain" link. > > I do not like the first option because packages you co-maintain differ > from "your" packages. Co-maintainers do not have the same privileges as > maintainers. > > I also do not really like the second option. Adding more and more > options and links clutters the UI and makes things inconvenient. For > example, we added a filter for exact package name searches in commit > 1c55e6b (Add option to search for exact name matches only (fixes > FS#23556)., 2011-04-06). I wish we had implemented it the way archweb > does it [1] back then. It is much more intuitive and clear. > > Transferring this idea to co-maintainer search, maybe the "My Packages" > page should have two sections: A list with packages one maintains, > followed by a second table of packages one co-maintains. It is not > entirely clear how to implement this as part of the package search, > especially when it comes to pagination. So, many topics to discuss > before coming up with a patch... > > [1] https://www.archlinux.org/packages/?q=linux > That (split results view) sounds like a good way of doing it. A search for maintainers could return co-maintainers as well, but separated. As for pagination, just return co-maintainers at the end (the last page)... I assume since co-maintained packages are "lesser", people will be less interested in them. There is no need to restrict the co-maintainers search to your own packages only, so it has nothing to do with "My Packages" as opposed to the maintainer search it is a shortcut for. ... Methinks now is a good time to move the discussion to [aur-dev]... -- Eli Schwartz

1 0

[aur-dev] aurweb 4.4.1 released
by Lukas Fleischer 18 Oct '16

18 Oct '16

Just for the record: The first maintenance release for aurweb 4.4 was released yesterday and the official setup [1] was upgraded. For a comprehensive list of changes, consult the Git log [2], and please report bugs to the aurweb bug tracker [3]. [1] https://aur.archlinux.org/ [2] https://projects.archlinux.org/aurweb.git/log/?id=v4.4.1 [3] https://bugs.archlinux.org/index.php?project=2

1 0

[aur-dev] [PATCH 1/3] aurweb/git: Add missing __init__.py file
by Lukas Fleischer 17 Oct '16

17 Oct '16

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- aurweb/git/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 aurweb/git/__init__.py diff --git a/aurweb/git/__init__.py b/aurweb/git/__init__.py new file mode 100644 index 0000000..e69de29 -- 2.10.0

1 2

[aur-dev] [PATCH] Do not show current day if registration date is unknown
by Lukas Fleischer 17 Oct '16

17 Oct '16

The registration date field on the account details page currently defaults to the current day if the user's registration date is unknown. To avoid confusion, show "unknown" in these cases instead. Fixes FS#51405. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/account_details.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/template/account_details.php b/web/template/account_details.php index b79685b..024bd9c 100644 --- a/web/template/account_details.php +++ b/web/template/account_details.php @@ -61,7 +61,11 @@ </tr> <tr> <th><?= __("Registration date:") ?></th> + <?php if ($row["RegistrationTS"]): ?> <td><?= (new DateTime($row["RegistrationTS"]))->format('Y-m-d') ?></td> + <?php else: ?> + <td><?= __("unknown") ?></td> + <?php endif; ?> </tr> <?php if (has_credential(CRED_ACCOUNT_LAST_LOGIN)): ?> <tr> -- 2.10.0

1 0