From ed504fff5da1eeaa69398ca2806494fd7b864227 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 28 Jan 2014 13:45:38 +0000 Subject: db: store options We need this for detecting !libc_* --- aports/db.lua | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/aports/db.lua b/aports/db.lua index 4bbee16..cfb7491 100644 --- a/aports/db.lua +++ b/aports/db.lua @@ -42,17 +42,17 @@ local function split(str) return t end -local function split_arch(archstr) +local function split_key(str) local t = {} - for _,arch in pairs(split(archstr)) do - t[arch] = true + for _,key in pairs(split(str)) do + t[key] = true end return t end local function split_apkbuild(line) local r = {} - local dir,pkgname, pkgver, pkgrel, arch, depends, makedepends, subpackages, linguas, source, url = string.match(line, "([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)") + local dir,pkgname, pkgver, pkgrel, arch, options, depends, makedepends, subpackages, linguas, source, url = string.match(line, "([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)") r.dir = dir r.pkgname = pkgname r.pkgver = pkgver @@ -63,7 +63,8 @@ local function split_apkbuild(line) r.subpackages = split_subpkgs(subpackages, r.linguas, pkgname) r.source = split(source) r.url = url - r.arch = split_arch(arch) + r.arch = split_key(arch) + r.options = split_key(options) return r end @@ -85,6 +86,7 @@ local function parse_apkbuilds(aportsdir, repos) pkgver= pkgrel= arch= + options= depends= makedepends= subpackages= @@ -95,7 +97,7 @@ local function parse_apkbuilds(aportsdir, repos) [ -n "$dir" ] || exit 1; cd "$dir"; . ./APKBUILD; - echo $dir\|$pkgname\|$pkgver\|$pkgrel\|$arch\|$depends\|$makedepends\|$subpackages\|$linguas\|$source\|$url ; + echo $dir\|$pkgname\|$pkgver\|$pkgrel\|$arch\|$options\|$depends\|$makedepends\|$subpackages\|$linguas\|$source\|$url ; done; ]]) return function() -- cgit v1.2.3