- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Do not redirect to details page after deletion
by Lukas Fleischer 03 Oct '15

03 Oct '15

When deleting a package base from the package base deletion form, do not try to redirect to the package base details page afterwards. Instead, jump to the package overview. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/pkgbase.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index a241c74..b98dc64 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -77,6 +77,7 @@ if (check_token()) { if (!isset($_POST['merge_Into']) || empty($_POST['merge_Into'])) { list($ret, $output) = pkgbase_delete($ids, NULL, $via); unset($_GET['ID']); + unset($base_id); } else { $merge_base_id = pkgbase_from_name($_POST['merge_Into']); @@ -89,6 +90,7 @@ if (check_token()) { } else { list($ret, $output) = pkgbase_delete($ids, $merge_base_id, $via); unset($_GET['ID']); + unset($base_id); } } } -- 2.6.0

1 0

[aur-dev] [PATCH] Redirect to details pages after performing actions
by Lukas Fleischer 03 Oct '15

03 Oct '15

After performing a package base action on a separate page, return to the corresponding package base details page. Partly fixes FS#46545. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/pkgdel.php | 2 +- web/html/pkgdisown.php | 2 +- web/html/pkgflag.php | 2 +- web/html/pkgmerge.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/html/pkgdel.php b/web/html/pkgdel.php index eb20967..c522e25 100644 --- a/web/html/pkgdel.php +++ b/web/html/pkgdel.php @@ -26,7 +26,7 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?> <?= __('Deletion of a package is permanent. '); ?> <?= __('Select the checkbox to confirm action.') ?> </p> - <form action="<?= get_uri('/pkgbase/'); ?>" method="post"> + <form action="<?= get_pkgbase_uri($pkgbase_name); ?>" method="post"> <fieldset> <input type="hidden" name="IDs[<?= $base_id ?>]" value="1" /> <input type="hidden" name="ID" value="<?= $base_id ?>" /> diff --git a/web/html/pkgdisown.php b/web/html/pkgdisown.php index 4842939..7ca6e6a 100644 --- a/web/html/pkgdisown.php +++ b/web/html/pkgdisown.php @@ -33,7 +33,7 @@ if (has_credential(CRED_PKGBASE_DISOWN, $maintainer_uids)): ?> <?= __('By selecting the checkbox, you confirm that you want to disown the package.') ?> <?php endif; ?> </p> - <form action="<?= get_uri('/pkgbase/'); ?>" method="post"> + <form action="<?= get_pkgbase_uri($pkgbase_name); ?>" method="post"> <fieldset> <input type="hidden" name="IDs[<?= $base_id ?>]" value="1" /> <input type="hidden" name="ID" value="<?= $base_id ?>" /> diff --git a/web/html/pkgflag.php b/web/html/pkgflag.php index bfe89e0..b1ca03b 100644 --- a/web/html/pkgflag.php +++ b/web/html/pkgflag.php @@ -27,7 +27,7 @@ if (has_credential(CRED_PKGBASE_FLAG)): ?> '<strong>', '</strong>'); ?> <?= __('Enter details on why the package is out-of-date below, preferably including links to the release announcement or the new release tarball.'); ?> </p> - <form action="<?= get_uri('/pkgbase/'); ?>" method="post"> + <form action="<?= get_pkgbase_uri($pkgbase_name); ?>" method="post"> <fieldset> <input type="hidden" name="IDs[<?= $base_id ?>]" value="1" /> <input type="hidden" name="ID" value="<?= $base_id ?>" /> diff --git a/web/html/pkgmerge.php b/web/html/pkgmerge.php index f6e951b..3511390 100644 --- a/web/html/pkgmerge.php +++ b/web/html/pkgmerge.php @@ -28,7 +28,7 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?> <?= __('Enter the package name you wish to merge the package into. '); ?> <?= __('Select the checkbox to confirm action.') ?> </p> - <form action="<?= get_uri('/pkgbase/'); ?>" method="post"> + <form action="<?= get_pkgbase_uri($pkgbase_name); ?>" method="post"> <fieldset> <input type="hidden" name="IDs[<?= $base_id ?>]" value="1" /> <input type="hidden" name="ID" value="<?= $base_id ?>" /> -- 2.6.0

1 0

[aur-dev] [PATCH] Fix a PHP "Undefined index" notice
by Lukas Fleischer 03 Oct '15

03 Oct '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/packages.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/html/packages.php b/web/html/packages.php index 38a2e29..1b89278 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -21,7 +21,11 @@ if (!isset($pkgid) || !isset($pkgname)) { $details = array(); if (isset($pkgid)) { $details = pkg_get_details($pkgid); - $pkgname = $details['Name']; + if (isset($details['Name'])) { + $pkgname = $details['Name']; + } else { + $pkgname = null; + } } else { unset($pkgname); } -- 2.6.0

1 0

[aur-dev] [PATCH] Fix dependency sorting
by Lukas Fleischer 03 Oct '15

03 Oct '15

Fixes a regression introduced in 9d2d8f1 (Honor virtual provisions in package requirements, 2015-09-17). Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkg_details.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index b9fd51b..8b038b9 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -40,6 +40,8 @@ $out_of_date_time = ($row["OutOfDateTS"] == 0) ? $msg : gmdate("Y-m-d", intval($ $lics = pkg_licenses($row["ID"]); $grps = pkg_groups($row["ID"]); +$deps = pkg_dependencies($row["ID"]); + usort($deps, function($x, $y) { if ($x[1] != $y[1]) { if ($x[1] == "depends") { @@ -80,7 +82,6 @@ foreach ($rels as $rel) { } } -$deps = pkg_dependencies($row["ID"]); $requiredby = pkg_required($row["Name"], $rels_p); # $sources[0] = 'src'; -- 2.6.0

1 0

[aur-dev] [PATCH] Fix parameter processing in parse_multiinfo_args()
by Lukas Fleischer 03 Oct '15

03 Oct '15

Fixes a regression introduced in 94aeead (aurjson: Pass http_data array to all functions, 2015-06-28). Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/aurjson.class.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index db9cc54..8ca028a 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -324,12 +324,11 @@ class AurJSON { * IDs and package names are valid; sort them into the relevant arrays and * escape/quote the names. * - * @param array $http_data Query parameters. + * @param array $args Query parameters. * * @return mixed An array containing 'ids' and 'names'. */ - private function parse_multiinfo_args($http_data) { - $args = $http_data['arg']; + private function parse_multiinfo_args($args) { if (!is_array($args)) { $args = array($args); } -- 2.6.0

1 0

[aur-dev] aurweb 4.1.0 released
by Lukas Fleischer 03 Oct '15

03 Oct '15

Hello, We are pleased to announce that aurweb 4.1.0 has been released. The official aurweb setup [1] has already been updated. Special thanks to Marcel Korpel who, among other things, made various improvements to the package comments interface. You can now edit comments! 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.1.0 [3] https://bugs.archlinux.org/index.php?project=2

1 0

[aur-dev] [PATCH] Show a warning if .SRCINFO is unchanged
by Lukas Fleischer 29 Sep '15

29 Sep '15

Warn users when a remote ref update does not change the content of .SRCINFO such that users are reminded of updating package meta data. Implements FS#46130. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- git-interface/git-update.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/git-interface/git-update.py b/git-interface/git-update.py index 4698382..b418525 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -169,6 +169,9 @@ def die(msg): sys.stderr.write("error: {:s}\n".format(msg)) exit(1) +def warn(msg): + sys.stderr.write("warning: {:s}\n".format(msg)) + def die_commit(msg, commit): sys.stderr.write("error: The following error " + "occurred when parsing commit\n") @@ -282,6 +285,13 @@ for commit in walker: if not fname in commit.tree: die_commit('missing source file: {:s}'.format(fname), str(commit.id)) +# Display a warning if .SRCINFO is unchanged. +if sha1_old != "0000000000000000000000000000000000000000": + srcinfo_id_old = repo[sha1_old].tree['.SRCINFO'].id + srcinfo_id_new = repo[sha1_new].tree['.SRCINFO'].id + if srcinfo_id_old == srcinfo_id_new: + warn(".SRCINFO unchanged. The package database will not be updated!") + # Read .SRCINFO from the HEAD commit. srcinfo_raw = repo[repo[sha1_new].tree['.SRCINFO'].id].data.decode() srcinfo_raw = srcinfo_raw.split('\n') -- 2.6.0

1 0

[aur-dev] [PATCH] Remove empty package bases after 24 hours
by Lukas Fleischer 29 Sep '15

29 Sep '15

By using the setup-repo command, it is currently possible to create empty package bases, which can be used to make package base reservations. Add a maintenance script to remove such empty package bases after 24 hours. Fixes FS#46279. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- scripts/pkgmaint.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100755 scripts/pkgmaint.py diff --git a/scripts/pkgmaint.py b/scripts/pkgmaint.py new file mode 100755 index 0000000..0eb9422 --- /dev/null +++ b/scripts/pkgmaint.py @@ -0,0 +1,25 @@ +#!/usr/bin/python3 + +import configparser +import mysql.connector +import os + +config = configparser.RawConfigParser() +config.read(os.path.dirname(os.path.realpath(__file__)) + "/../conf/config") + +aur_db_host = config.get('database', 'host') +aur_db_name = config.get('database', 'name') +aur_db_user = config.get('database', 'user') +aur_db_pass = config.get('database', 'password') +aur_db_socket = config.get('database', 'socket') + +db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, + passwd=aur_db_pass, db=aur_db_name, + unix_socket=aur_db_socket, buffered=True) +cur = db.cursor() + +cur.execute("DELETE FROM PackageBases WHERE " + + "UNIX_TIMESTAMP() - SubmittedTS > 86400 AND PackagerUID IS NULL") + +db.commit() +db.close() -- 2.6.0

1 0

[aur-dev] [PATCH] AUTHORS: Add date ranges to current maintainers
by Lukas Fleischer 29 Sep '15

29 Sep '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- AUTHORS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 4462cab..18c1337 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,8 +1,8 @@ Current Maintainers ------------------- -* Lukas Fleischer <lfleischer(a)archlinux.org> -* Johannes Löthberg <johannes(a)kyriasis.com> +* Lukas Fleischer <lfleischer(a)archlinux.org> (2011-present) +* Johannes Löthberg <johannes(a)kyriasis.com> (2015-present) Past Maintainers ---------------- -- 2.6.0

1 0

[aur-dev] 4.1.0 string freeze
by Lukas Fleischer 26 Sep '15

26 Sep '15

Dear translators, I just submitted the final message catalog for 4.1.0. There are 26 new strings to translate. The release is scheduled for Saturday, October 3rd. Thank you for your continued contributions! Regards, Lukas

1 0