June 2015 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH v2 1/2] home: Add submitting packages section
by Johannes Löthberg 14 Jun '15

14 Jun '15

Link to the ArchWiki and lists any SSH fingerprints configured in the AUR config file Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- Changes since v1: * Rephrase the section text mentioning AUR4 * Changed to use config_section_exists (do'h) * Rephrase ssh-fingerprints text * Fix type where I used <ul> instead of <li> * Use string concatenation and htmlspecialchars instead of interpolation web/html/home.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/web/html/home.php b/web/html/home.php index 6b54af3..58e84e0 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -71,6 +71,28 @@ html_header( __("Home") ); ?> </p> </div> + <h4><?= __('Submitting Packages') ?></h4> + <div class="article-content"> + <p> + <?php + echo __( + 'Git over SSH is now used to submit packages to the AUR. See the %sAUR4 section%s of the Arch User Repository ArchWiki page for more details.', + '<a href="https://wiki.archlinux.org/index.php/Arch_User_Repository#AUR_4">', + '</a>' + ); + ?> + </p> + <?php + if (config_section_exists('fingerprints')) { + echo __('The following SSH fingerprints are used for the AUR:') + echo '<ul>'; + foreach (config_items('fingerprints') as $type => $fingerprint) { + echo '<li><code>' . htmlspecialchars($type) '</code>: <code>' . htmlspecialchars($fingerprint) . '</code></li>'; + } + echo '</ul>'; + } + ?> + </div> <h4><?= __('Discussion') ?></h4> <div class="article-content"> <p> -- 2.4.2

1 3

[aur-dev] [PATCH v3 1/3] confparser: Split loading of config into own function
by Johannes Löthberg 14 Jun '15

14 Jun '15

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- web/lib/confparser.inc.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/lib/confparser.inc.php b/web/lib/confparser.inc.php index 3977911..ae862d3 100644 --- a/web/lib/confparser.inc.php +++ b/web/lib/confparser.inc.php @@ -1,11 +1,16 @@ <?php -function config_get($section, $key) { +function config_load() { global $AUR_CONFIG; if (!isset($AUR_CONFIG)) { $AUR_CONFIG = parse_ini_file("../../conf/config", true, INI_SCANNER_RAW); } +} + +function config_get($section, $key) { + global $AUR_CONFIG; + config_load() return $AUR_CONFIG[$section][$key]; } -- 2.4.2

1 2

[aur-dev] [PATCH 1/2] home: Add submitting packages section
by Johannes Löthberg 14 Jun '15

14 Jun '15

Links to ArchWiki and lists any SSH fingerprints configured in tho AUR config file Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- web/html/home.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/web/html/home.php b/web/html/home.php index 6b54af3..84df361 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -71,6 +71,28 @@ html_header( __("Home") ); ?> </p> </div> + <h4><?= __('Submitting Packages') ?></h4> + <div class="article-content"> + <p> + <?php + echo __( + 'From AUR 4 Git is used to submit packages to the AUR over SSH. See the %sAUR4 section%s of the Arch User Repository ArchWiki page for more details.', + '<a href="https://wiki.archlinux.org/index.php/Arch_User_Repository#AUR_4">', + '</a>' + ); + ?> + </p> + <?php + if (config_key_exists('fingerprints')) { + echo __('Following are the SSH fingerprints for the AUR:'); + echo '<ul>'; + foreach (config_items('fingerprints') as $type => $fingerprint) { + echo "<ul>$type: $fingerprint</ul>"; + } + echo '</ul>'; + } + ?> + </div> <h4><?= __('Discussion') ?></h4> <div class="article-content"> <p> -- 2.4.2

2 2

[aur-dev] [PATCH 1/3] confparser: Split loading of config into own function
by Johannes Löthberg 14 Jun '15

14 Jun '15

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- web/lib/confparser.inc.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/lib/confparser.inc.php b/web/lib/confparser.inc.php index 3977911..ae862d3 100644 --- a/web/lib/confparser.inc.php +++ b/web/lib/confparser.inc.php @@ -1,11 +1,16 @@ <?php -function config_get($section, $key) { +function config_load() { global $AUR_CONFIG; if (!isset($AUR_CONFIG)) { $AUR_CONFIG = parse_ini_file("../../conf/config", true, INI_SCANNER_RAW); } +} + +function config_get($section, $key) { + global $AUR_CONFIG; + config_load() return $AUR_CONFIG[$section][$key]; } -- 2.4.2

2 4

[aur-dev] [PATCH] git-update: Fix parsing of versioned optdepends
by Lukas Fleischer 14 Jun '15

14 Jun '15

Fixes FS#43649. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- git-interface/git-update.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/git-interface/git-update.py b/git-interface/git-update.py index d87fac7..ebed491 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -36,6 +36,16 @@ def extract_arch_fields(pkginfo, field): return values +def parse_dep(depstring): + dep, _, desc = depstring.partition(': ') + depname = re.sub(r'(<|=|>).*', '', dep) + depcond = dep[len(depname):] + + if (desc): + return (depname + ': ' + desc, depcond) + else: + return (depname, depcond) + def save_srcinfo(srcinfo, db, cur, user): # Obtain package base ID and previous maintainer. pkgbase = srcinfo._pkgbase['pkgname'] @@ -89,8 +99,7 @@ def save_srcinfo(srcinfo, db, cur, user): [deptype]) deptypeid = cur.fetchone()[0] for dep_info in extract_arch_fields(pkginfo, deptype): - depname = re.sub(r'(<|=|>).*', '', dep_info['value']) - depcond = dep_info['value'][len(depname):] + depname, depcond = parse_dep(dep_info['value']) deparch = dep_info['arch'] cur.execute("INSERT INTO PackageDepends (PackageID, " + "DepTypeID, DepName, DepCondition, DepArch) " + @@ -103,8 +112,7 @@ def save_srcinfo(srcinfo, db, cur, user): [reltype]) reltypeid = cur.fetchone()[0] for rel_info in extract_arch_fields(pkginfo, reltype): - relname = re.sub(r'(<|=|>).*', '', rel_info['value']) - relcond = rel_info['value'][len(relname):] + relname, relcond = parse_dep(rel_info['value']) relarch = rel_info['arch'] cur.execute("INSERT INTO PackageRelations (PackageID, " + "RelTypeID, RelName, RelCondition, RelArch) " + -- 2.4.3

1 0

[aur-dev] [PATCH 1/2] Refactor code for printing account links
by Lukas Fleischer 14 Jun '15

14 Jun '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/aur.inc.php | 13 +++++++++++-- web/template/pkg_details.php | 18 ------------------ web/template/pkgbase_details.php | 18 ------------------ web/template/tu_last_votes_list.php | 2 +- 4 files changed, 12 insertions(+), 39 deletions(-) diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php index c4a1705..2d06fc8 100644 --- a/web/lib/aur.inc.php +++ b/web/lib/aur.inc.php @@ -181,10 +181,19 @@ function username_from_sid($sid="") { * * @param string $username The user name to format * - * @return void + * @return string The generated HTML code for the account link */ function html_format_username($username) { - return $username ? htmlspecialchars($username) : __("None"); + $username_fmt = $username ? htmlspecialchars($username, ENT_QUOTES) : __("None"); + + if ($username && $_COOKIE["AURSID"]) { + $link = '<a href="' . get_uri('/account/') . $username_fmt; + $link .= '" title="' . __('View account information for %s', $username_fmt); + $link .= '">' . $username_fmt . '</a>'; + return $link; + } else { + return $username_fmt; + } } /** diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index cc2f055..7b75210 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -289,33 +289,15 @@ if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): <?php endif; ?> <tr> <th><?= __('Submitter') .': ' ?></th> - <?php if ($row["SubmitterUID"] && $SID): ?> - <td><a href="<?= get_uri('/account/') . html_format_username($submitter, ENT_QUOTES) ?>" title="<?= __('View account information for %s', html_format_username($submitter)) ?>"><?= html_format_username($submitter) ?></a></td> - <?php elseif ($row["SubmitterUID"] && !$SID): ?> <td><?= html_format_username($submitter) ?></td> - <?php else: ?> - <td><?= __('None') ?></td> - <?php endif; ?> </tr> <tr> <th><?= __('Maintainer') .': ' ?></th> - <?php if ($row["MaintainerUID"] && $SID): ?> - <td><a href="<?= get_uri('/account/') . html_format_username($maintainer) ?>" title="<?= __('View account information for %s', html_format_username($maintainer)) ?>"><?= html_format_username($maintainer) ?></a></td> - <?php elseif ($row["MaintainerUID"] && !$SID): ?> <td><?= html_format_username($maintainer) ?></td> - <?php else: ?> - <td><?= __('None') ?></td> - <?php endif; ?> </tr> <tr> <th><?= __('Last Packager') .': ' ?></th> - <?php if ($row["PackagerUID"] && $SID): ?> - <td><a href="<?= get_uri('/account/') . html_format_username($packager) ?>" title="<?= __('View account information for %s', html_format_username($packager)) ?>"><?= html_format_username($packager) ?></a></td> - <?php elseif ($row["PackagerUID"] && !$SID): ?> <td><?= html_format_username($packager) ?></td> - <?php else: ?> - <td><?= __('None') ?></td> - <?php endif; ?> </tr> <tr> <th><?= __('Votes') . ': ' ?></th> diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index 2522f34..2ceb35f 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -148,33 +148,15 @@ if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): <?php endif; ?> <tr> <th><?= __('Submitter') .': ' ?></th> - <?php if ($row["SubmitterUID"] && $SID): ?> - <td><a href="<?= get_uri('/account/') . html_format_username($submitter, ENT_QUOTES) ?>" title="<?= __('View account information for %s', html_format_username($submitter)) ?>"><?= html_format_username($submitter) ?></a></td> - <?php elseif ($row["SubmitterUID"] && !$SID): ?> <td><?= html_format_username($submitter) ?></td> - <?php else: ?> - <td><?= __('None') ?></td> - <?php endif; ?> </tr> <tr> <th><?= __('Maintainer') .': ' ?></th> - <?php if ($row["MaintainerUID"] && $SID): ?> - <td><a href="<?= get_uri('/account/') . html_format_username($maintainer) ?>" title="<?= __('View account information for %s', html_format_username($maintainer)) ?>"><?= html_format_username($maintainer) ?></a></td> - <?php elseif ($row["MaintainerUID"] && !$SID): ?> <td><?= html_format_username($maintainer) ?></td> - <?php else: ?> - <td><?= __('None') ?></td> - <?php endif; ?> </tr> <tr> <th><?= __('Last Packager') .': ' ?></th> - <?php if ($row["PackagerUID"] && $SID): ?> - <td><a href="<?= get_uri('/account/') . html_format_username($packager) ?>" title="<?= __('View account information for %s', html_format_username($packager)) ?>"><?= html_format_username($packager) ?></a></td> - <?php elseif ($row["PackagerUID"] && !$SID): ?> <td><?= html_format_username($packager) ?></td> - <?php else: ?> - <td><?= __('None') ?></td> - <?php endif; ?> </tr> <tr> <th><?= __('Votes') . ': ' ?></th> diff --git a/web/template/tu_last_votes_list.php b/web/template/tu_last_votes_list.php index f7b07bc..5cff248 100644 --- a/web/template/tu_last_votes_list.php +++ b/web/template/tu_last_votes_list.php @@ -21,7 +21,7 @@ ?> <tr class="<?= $c ?>"> <td> - <a href="<?= get_uri('/account/') . html_format_username($username) ?>" title="<?= __('View account information for %s', html_format_username($username)) ?>"><?= html_format_username($username) ?></a> + <?= html_format_username($username) ?> </td> <td> <a href="<?= get_uri('/tu/'); ?>?id=<?= $row['LastVote'] ?>"><?= intval($row["LastVote"]) ?></a> -- 2.4.3

1 1

[aur-dev] Missing install file:
by Aaron Fischer 13 Jun '15

13 Jun '15

Hi! I have a problem pushing a package to AUR4. The push declined with this error: remote: error: The following error occurred when parsing commit remote: error: 1e0137afecd85510a537ef5033c5b388b8f24b21: remote: error: missing install file: remote: error: hook declined to update refs/heads/master To ssh+git://aur@aur4.archlinux.org:22/roccat-tools.git ! [remote rejected] master -> master (hook declined) I've checked my repository[1] for commits which have no install file: for h in `git log --format=%H`; do [[ -f roccat-tools.install ]] || echo "Not in $h" done Every commit has the install file on it. So, whats the problem here? Aaron [1]:https://github.com/f0086/aur4-migration-roccat-tools

3 5

[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.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

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> - <p class="readmore"><a href="https://wiki.archlinux.org/index.php/AUR">Learn more...</a></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> -- 2.4.3

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-interface/aurinfo.py b/git-interface/aurinfo.py index d9b9372..86d0705 100644 --- a/git-interface/aurinfo.py +++ b/git-interface/aurinfo.py @@ -132,8 +132,12 @@ def ParseAurinfoFromIterable(iterable, ecatcher=None): if key == 'pkgbase': current_package = aurinfo.SetPkgbase(value) - else: + 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: -- 2.4.2

1 0