- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH/RFC] git-update: Replace aurinfo.py with python-srcinfo
by Johannes Löthberg 13 Jun '15

13 Jun '15

python-srcinfo is a more transparent and simpler library for parsing SRCINFO files. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- This patch has not been tested yet so should not be merged git-interface/aurinfo.py | 208 -------------------------------------------- git-interface/git-update.py | 39 ++++----- 2 files changed, 18 insertions(+), 229 deletions(-) delete mode 100644 git-interface/aurinfo.py diff --git a/git-interface/aurinfo.py b/git-interface/aurinfo.… [View More]py deleted file mode 100644 index 86d0705..0000000 --- a/git-interface/aurinfo.py +++ /dev/null @@ -1,208 +0,0 @@ -#!/usr/bin/env python - -from copy import copy, deepcopy -import pprint -import sys - -class Attr(object): - def __init__(self, name, is_multivalued=False, allow_arch_extensions=False): - self.name = name - self.is_multivalued = is_multivalued - self.allow_arch_extensions = allow_arch_extensions - -PKGBUILD_ATTRIBUTES = { - 'arch': Attr('arch', True), - 'backup': Attr('backup', True), - 'changelog': Attr('changelog', False), - 'checkdepends': Attr('checkdepends', True), - 'conflicts': Attr('conflicts', True, True), - 'depends': Attr('depends', True, True), - 'epoch': Attr('epoch', False), - 'groups': Attr('groups', True), - 'install': Attr('install', False), - 'license': Attr('license', True), - 'makedepends': Attr('makedepends', True, True), - 'md5sums': Attr('md5sums', True, True), - 'noextract': Attr('noextract', True), - 'optdepends': Attr('optdepends', True, True), - 'options': Attr('options', True), - 'pkgname': Attr('pkgname', False), - 'pkgrel': Attr('pkgrel', False), - 'pkgver': Attr('pkgver', False), - 'provides': Attr('provides', True, True), - 'replaces': Attr('replaces', True, True), - 'sha1sums': Attr('sha1sums', True, True), - 'sha224sums': Attr('sha224sums', True, True), - 'sha256sums': Attr('sha256sums', True, True), - 'sha384sums': Attr('sha384sums', True, True), - 'sha512sums': Attr('sha512sums', True, True), - 'source': Attr('source', True, True), - 'url': Attr('url', False), - 'validpgpkeys': Attr('validpgpkeys', True), -} - -def find_attr(attrname): - # exact match - attr = PKGBUILD_ATTRIBUTES.get(attrname, None) - if attr: - return attr - - # prefix match - # XXX: this could break in the future if PKGBUILD(5) ever - # introduces a key which is a subset of another. - for k in PKGBUILD_ATTRIBUTES.keys(): - if attrname.startswith(k + '_'): - return PKGBUILD_ATTRIBUTES[k] - -def IsMultiValued(attrname): - attr = find_attr(attrname) - return attr and attr.is_multivalued - -class AurInfo(object): - def __init__(self): - self._pkgbase = {} - self._packages = {} - - def GetPackageNames(self): - return self._packages.keys() - - def GetMergedPackage(self, pkgname): - package = deepcopy(self._pkgbase) - package['pkgname'] = pkgname - for k, v in self._packages.get(pkgname).items(): - package[k] = deepcopy(v) - return package - - def AddPackage(self, pkgname): - self._packages[pkgname] = {} - return self._packages[pkgname] - - def SetPkgbase(self, pkgbasename): - self._pkgbase = {'pkgname' : pkgbasename} - return self._pkgbase - - -class StderrECatcher(object): - def Catch(self, lineno, error): - print('ERROR[%d]: %s' % (lineno, error), file=sys.stderr) - - -class CollectionECatcher(object): - def __init__(self): - self._errors = [] - - def Catch(self, lineno, error): - self._errors.append((lineno, error)) - - def HasErrors(self): - return len(self._errors) > 0 - - def Errors(self): - return copy(self._errors) - - -def ParseAurinfoFromIterable(iterable, ecatcher=None): - aurinfo = AurInfo() - - if ecatcher is None: - ecatcher = StderrECatcher() - - current_package = None - lineno = 0 - - for line in iterable: - lineno += 1 - - if line.startswith('#'): - continue - - if not line.strip(): - # end of package - current_package = None - continue - - if not line.startswith('\t'): - # start of new package - try: - key, value = map(str.strip, line.split('=', 1)) - except ValueError: - ecatcher.Catch(lineno, 'unexpected header format in section=%s' % - current_package['pkgname']) - continue - - if key == 'pkgbase': - current_package = aurinfo.SetPkgbase(value) - elif key == 'pkgname': - current_package = aurinfo.AddPackage(value) - else: - ecatcher.Catch(lineno, 'unexpected new section not starting ' - 'with \'pkgname\' found') - continue - else: - # package attribute - if current_package is None: - ecatcher.Catch(lineno, 'package attribute found outside of ' - 'a package section') - continue - - try: - key, value = map(str.strip, line.split('=', 1)) - except ValueError: - ecatcher.Catch(lineno, 'unexpected attribute format in ' - 'section=%s' % current_package['pkgname']) - - if IsMultiValued(key): - if not current_package.get(key): - current_package[key] = [] - if value: - current_package[key].append(value) - else: - if not current_package.get(key): - current_package[key] = value - else: - ecatcher.Catch(lineno, 'overwriting attribute ' - '%s: %s -> %s' % (key, current_package[key], - value)) - - return aurinfo - - -def ParseAurinfo(filename='.AURINFO', ecatcher=None): - with open(filename) as f: - return ParseAurinfoFromIterable(f, ecatcher) - - -def ValidateAurinfo(filename='.AURINFO'): - ecatcher = CollectionECatcher() - ParseAurinfo(filename, ecatcher) - errors = ecatcher.Errors() - for error in errors: - print('error on line %d: %s' % error, file=sys.stderr) - return not errors - - -if __name__ == '__main__': - pp = pprint.PrettyPrinter(indent=4) - - if len(sys.argv) == 1: - print('error: not enough arguments') - sys.exit(1) - elif len(sys.argv) == 2: - action = sys.argv[1] - filename = '.AURINFO' - else: - action, filename = sys.argv[1:3] - - if action == 'parse': - aurinfo = ParseAurinfo() - for pkgname in aurinfo.GetPackageNames(): - print(">>> merged package: %s" % pkgname) - pp.pprint(aurinfo.GetMergedPackage(pkgname)) - print() - elif action == 'validate': - sys.exit(not ValidateAurinfo(filename)) - else: - print('unknown action: %s' % action) - sys.exit(1) - -# vim: set et ts=4 sw=4: diff --git a/git-interface/git-update.py b/git-interface/git-update.py index d87fac7..a3347d1 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -8,7 +8,8 @@ import pygit2 import re import sys -import aurinfo +import srcinfo.parse +import srcinfo.utils config = configparser.RawConfigParser() config.read(os.path.dirname(os.path.realpath(__file__)) + "/../conf/config") @@ -38,7 +39,7 @@ def extract_arch_fields(pkginfo, field): def save_srcinfo(srcinfo, db, cur, user): # Obtain package base ID and previous maintainer. - pkgbase = srcinfo._pkgbase['pkgname'] + pkgbase = srcinfo['pkgbase'] cur.execute("SELECT ID, MaintainerUID FROM PackageBases " "WHERE Name = %s", [pkgbase]) (pkgbase_id, maintainer_uid) = cur.fetchone() @@ -58,8 +59,8 @@ def save_srcinfo(srcinfo, db, cur, user): cur.execute("DELETE FROM Packages WHERE PackageBaseID = %s", [pkgbase_id]) - for pkgname in srcinfo.GetPackageNames(): - pkginfo = srcinfo.GetMergedPackage(pkgname) + for pkgname in srcinfo.utils.get_package_names(srcinfo): + pkginfo = srcinfo.utils.get_merged_package(pkgname, srcinfo) if 'epoch' in pkginfo and int(pkginfo['epoch']) > 0: ver = '%d:%s-%s' % (int(pkginfo['epoch']), pkginfo['pkgver'], @@ -220,24 +221,21 @@ for commit in walker: die_commit("maximum blob size (250kB) exceeded", commit.id) srcinfo_raw = repo[commit.tree['.SRCINFO'].id].data.decode() - srcinfo_raw = srcinfo_raw.split('\n') - ecatcher = aurinfo.CollectionECatcher() - srcinfo = aurinfo.ParseAurinfoFromIterable(srcinfo_raw, ecatcher) - errors = ecatcher.Errors() + (srcinfo, errors) = srcinfo.parse.parse_srcinfo(srcinfo_raw) if errors: - sys.stderr.write("error: The following errors occurred " - "when parsing .SRCINFO in commit\n") - sys.stderr.write("error: %s:\n" % (commit.id)) + print('error: The following errors occured ' + 'while parsing .SRCINFO in commit', file=sys.stderr) + print('error: {:s}'.format(commit.id), file=sys.stderr) for error in errors: - sys.stderr.write("error: line %d: %s\n" % error) + print('error: {:s}'.format(error), file=sys.stderr) exit(1) - srcinfo_pkgbase = srcinfo._pkgbase['pkgname'] + srcinfo_pkgbase = srcinfo['pkgbase'] if not re.match(repo_regex, srcinfo_pkgbase): die_commit('invalid pkgbase: %s' % (srcinfo_pkgbase), commit.id) - for pkgname in srcinfo.GetPackageNames(): - pkginfo = srcinfo.GetMergedPackage(pkgname) + for pkgname in set(srcinfo['packages'].keys()): + pkginfo = srcinfo.utils.get_merged_package(pkgname, srcinfo) for field in ('pkgver', 'pkgrel', 'pkgname', 'pkgdesc', 'url'): if not field in pkginfo: @@ -271,19 +269,18 @@ for commit in walker: die_commit('missing source file: %s' % (fname), commit.id) srcinfo_raw = repo[repo[sha1_new].tree['.SRCINFO'].id].data.decode() -srcinfo_raw = srcinfo_raw.split('\n') -srcinfo = aurinfo.ParseAurinfoFromIterable(srcinfo_raw) +srcinfo = srcinfo.parse.parse_srcinfo(srcinfo_raw) -srcinfo_pkgbase = srcinfo._pkgbase['pkgname'] +srcinfo_pkgbase = srcinfo['pkgbase'] if srcinfo_pkgbase != pkgbase: die('invalid pkgbase: %s' % (srcinfo_pkgbase)) -pkgbase = srcinfo._pkgbase['pkgname'] +pkgbase = srcinfo['pkgbase'] cur.execute("SELECT ID FROM PackageBases WHERE Name = %s", [pkgbase]) pkgbase_id = cur.fetchone()[0] -for pkgname in srcinfo.GetPackageNames(): - pkginfo = srcinfo.GetMergedPackage(pkgname) +for pkgname in srcinfo.utils.get_package_names(srcinfo): + pkginfo = srcinfo.utils.get_merged_package(pkgname, srcinfo) pkgname = pkginfo['pkgname'] if pkgname in blacklist: -- 2.4.2 [View Less]

2 3

[aur-dev] [PATCH] Make "Learn more..." translatable
by Lukas Fleischer 13 Jun '15

13 Jun '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/home.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/html/home.php b/web/html/home.php index 569f322..6b54af3 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -41,7 +41,7 @@ html_header( __("Home") ); <?= __('DISCLAIMER') ?>: <?= __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.'); ?> </p> - <… [View More]

1 0

[aur-dev] [PATCH] aurinfo: Fix bug with space indents creating split packages
by Johannes Löthberg 12 Jun '15

12 Jun '15

If a .SRCINFO line doesn't start with a tab, check if the key is pkgname before adding it as a package. Fixes a bug where if you have accidentally gotten a line indented with spaces, from that line forward it will think it is a split package, instead of erroring out. Reported-by: Raansu <Gero3977(a)gmail.com> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- git-interface/aurinfo.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/git-… [View More]

1 0

[aur-dev] [PATCH] git-serve: Support cloning with simplified paths
by Johannes Löthberg 12 Jun '15

12 Jun '15

This commit adds support for cloning repositories over SSH without a leading slash or with a trailing .git Fixes FS#45260 Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- git-interface/git-serve.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/git-interface/git-serve.py b/git-interface/git-serve.py index a6dee13..26aa02d 100755 --- a/git-interface/git-serve.py +++ b/git-interface/git-serve.py @@ -123,8 +123,10 @@ if action == 'git-upload-pack' … [View More]

1 0

[aur-dev] [PATCH] Improve the regular expression to match HTTP clones
by Lukas Fleischer 12 Jun '15

12 Jun '15

Specifically check for URIs git-http-backend(1) can handle. This also allows us to make the ".git" suffix optional. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index a2a6153..9040c17 100644 --- a/INSTALL +++ b/INSTALL @@ -48,7 +48,7 @@ Setup on Arch Linux 9) If you want to enable smart HTTP support with nginx and uWSGI, you can use the following directives: - … [View More]

1 0

[aur-dev] [PATCH] git-serve: Fix cloning with paths not starting with /
by Johannes Löthberg 12 Jun '15

12 Jun '15

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- git-interface/git-serve.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git-interface/git-serve.py b/git-interface/git-serve.py index a6dee13..85f077b 100755 --- a/git-interface/git-serve.py +++ b/git-interface/git-serve.py @@ -123,7 +123,9 @@ if action == 'git-upload-pack' or action == 'git-receive-pack': die_with_help("%s: missing path" % (action)) path = cmdargv[1].rstrip('/') - … [View More]

1 0

[aur-dev] [PATCH] Autofocus input fields at login and package-search
by Gordian Edenhofer 11 Jun '15

11 Jun '15

At the login and the package search page, the user is promted to provide some input. Until now it was neccessary to first click the field in which the input should be placed. This can be simplified with HTML5 using the autofocus attribute of the input element, though not included in XHTML 1.0, the attribute was at least given a value to comply with the standard. Signed-off-by: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> --- web/html/login.php | 2 +- web/template/… [View More]

3 5

[aur-dev] [PATCH] stats.inc.php: Show the 15 most recent updates
by Lukas Fleischer 11 Jun '15

11 Jun '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/stats.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/stats.inc.php b/web/lib/stats.inc.php index 6ca5011..52637be 100644 --- a/web/lib/stats.inc.php +++ b/web/lib/stats.inc.php @@ -15,7 +15,7 @@ function updates_table() { $q.= 'FROM Packages INNER JOIN PackageBases ON '; $q.= 'Packages.PackageBaseID = PackageBases.ID '; $q.= 'WHERE PackageBases.PackagerUID IS NOT NULL '; -… [View More]

1 0

[aur-dev] [PATCH] Redesign the home page
by Lukas Fleischer 11 Jun '15

11 Jun '15

* Make the home page look even more like the archweb home page. * Add information on package requests. * Improve texts on discussion and bug reporting. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/css/aurweb.css | 4 ++++ web/html/home.php | 51 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index c86c1da..a3f43bd 100644 --- a/web/html/… [View More]css/aurweb.css +++ b/web/html/css/aurweb.css @@ -81,3 +81,7 @@ legend { padding: 1em 0; } + +p.important { + font-weight: bold; +} diff --git a/web/html/home.php b/web/html/home.php index 031ad2b..569f322 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -26,8 +26,6 @@ html_header( __("Home") ); '</a>' ); ?> - </p> - <p> <?php echo __( 'Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s otherwise they will be deleted!', @@ -36,30 +34,63 @@ html_header( __("Home") ); '</a>' ); ?> - </p> - <p> <?= __('Remember to vote for your favourite packages!'); ?> <?= __('Some packages may be provided as binaries in [community].'); ?> </p> + <p class="important"> + <?= __('DISCLAIMER') ?>: + <?= __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.'); ?> + </p> + <p class="readmore"><a href="https://wiki.archlinux.org/index.php/AUR">Learn more...</a></p> + </div> + <div id="news"> + <h3><a><?= __('Support') ?></a><span class="arrow"></span></h3> + <h4><?= __('Package Requests') ?></h4> + <div class="article-content"> + <p> + <?php + echo __( + 'There are three types of requests that can be filed in the %sPackage Actions%s box on the package details page:', + '<var>', + '</var>' + ); + ?> + </p> + <ul> + <li><em><?= __('Orphan Request') ?></em>: <?= __('Request a package to be disowned, e.g. when the maintainer is inactive and the package has been flagged out-of-date for a long time.') ?></li> + <li><em><?= __('Deletion Request') ?></em>: <?= __('Request a package to be removed from the Arch User Repository. Please do not use this if a package is broken and can be fixed easily. Instead, contact the package maintainer and file orphan request if necessary.') ?></li> + <li><em><?= __('Merge Request') ?></em>: <?= __('Request a package to be merged into another one. Can be used when a package needs to be renamed or replaced by a split package.') ?></li> + </ul> + <p> + <?php + echo __( + 'If you want to discuss a request, you can use the %saur-requests%s mailing list. However, please do not use that list to file requests.', + '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-requests">', + '</a>' + ); + ?> + </p> + </div> <h4><?= __('Discussion') ?></h4> + <div class="article-content"> <p> <?php echo __( - 'General discussion regarding the Arch User Repository (AUR) and Trusted User structure takes place on %saur-general%s. Package orphan requests, merge requests, and deletion requests should be filed in the %sPackage Actions%s box. For discussion relating to the development of the AUR web interface, use the %saur-dev%s mailing list.', + 'General discussion regarding the Arch User Repository (AUR) and Trusted User structure takes place on %saur-general%s. For discussion relating to the development of the AUR web interface, use the %saur-dev%s mailing list.', '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-general">', '</a>', - '<var>', - '</var>', '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-dev">', '</a>' ); ?> </p> + </div> <h4><?= __('Bug Reporting') ?></h4> + <div class="article-content"> <p> <?php echo __( - 'If you find a bug in the AUR, please fill out a bug report on our %sbug tracker%s. Use the tracker to report bugs in the AUR %sonly%s. To report packaging bugs contact the package maintainer or leave a comment on the appropriate package page.', + 'If you find a bug in the AUR web interface, please fill out a bug report on our %sbug tracker%s. Use the tracker to report bugs in the AUR %sonly%s. To report packaging bugs contact the package maintainer or leave a comment on the appropriate package page.', '<a href="https://bugs.archlinux.org/index.php?project=2">', '</a>', '<strong>', @@ -67,10 +98,6 @@ html_header( __("Home") ); ); ?> </p> - - <h4><?= __('DISCLAIMER') ?></h4> - <div class="important"> - <?= __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.'); ?> </div> </div> </div> -- 2.4.2 [View Less]

1 0

[aur-dev] [PATCH 1/4] Add popupdate script
by Lukas Fleischer 11 Jun '15

11 Jun '15

This adds a simple script that can be used to recalculate the number of votes per package. It can be used in a cronjob. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- scripts/popupdate.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100755 scripts/popupdate.py diff --git a/scripts/popupdate.py b/scripts/popupdate.py new file mode 100755 index 0000000..489cd41 --- /dev/null +++ b/scripts/popupdate.py @@ -0,0 +1,27 @@ +#!/usr/bin/… [View More]

1 3