summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Chantry <shiningxc@gmail.com>2009-09-02 18:29:19 +0200
committerAaron Griffin <aaronmgriffin@gmail.com>2009-09-18 22:18:52 +0200
commitea827b50d0c65b4ba9f2e2d3c0761572915e6b03 (patch)
treeddf005650a6a10de2aca5e6272485cdaa6efabcd
parentee0dd1ef6e9a0169ad54947758f2d7858a60d960 (diff)
downloaddbscripts-ea827b50d0c65b4ba9f2e2d3c0761572915e6b03.tar.gz
dbscripts-ea827b50d0c65b4ba9f2e2d3c0761572915e6b03.tar.xz
add the repo/ info to most results, and sort them
Add repo information to most results by using the repo/pkgname syntax (instead of only pkgname) Sort all results list (with the point above, this sorts the results by repo :)) Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-rwxr-xr-xcron-jobs/check_archlinux/check_packages.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/cron-jobs/check_archlinux/check_packages.py b/cron-jobs/check_archlinux/check_packages.py
index feab987..96f3181 100755
--- a/cron-jobs/check_archlinux/check_packages.py
+++ b/cron-jobs/check_archlinux/check_packages.py
@@ -189,7 +189,7 @@ def verify_deps(name,repo,deps):
for dep in deps:
pkglist = verify_dep(dep)
if pkglist == []:
- missdeps.append(name + " --> '" + dep + "'")
+ missdeps.append(repo + "/" + name + " --> '" + dep + "'")
else:
valid_repos = get_repo_hierarchy(repo)
pkgdep = None
@@ -252,12 +252,12 @@ def get_repo_hierarchy(repo):
else:
return ['core','extra','community']
-def verify_archs(name,archs):
+def verify_archs(name,repo,archs):
valid_archs = ['any', 'i686', 'x86_64']
invalid_archs = []
for arch in archs:
if arch not in valid_archs:
- invalid_archs.append(name + " --> " + arch)
+ invalid_archs.append(repo + "/" + name + " --> " + arch)
return invalid_archs
def find_scc(packages):
@@ -295,7 +295,7 @@ def tarjan(pkg):
return
path = pkg.name
while pkg != dep:
- path = dep.name + ">" + path
+ path = dep.repo + "/" + dep.name + ">" + path
dep = S.pop()
path = dep.name + ">" + path
if pkg.repo in repos:
@@ -318,6 +318,7 @@ def print_missdeps(pkgname,missdeps) :
def print_result(list, subheading):
if len(list) > 0:
+ list.sort()
print_subheading(subheading)
for item in list:
print item
@@ -445,7 +446,7 @@ for name,pkg in repopkgs.iteritems():
print "==> checking archs"
for name,pkg in repopkgs.iteritems():
- archs = verify_archs(name,pkg.archs)
+ archs = verify_archs(name,pkg.repo,pkg.archs)
invalid_archs.extend(archs)
# ugly hack to strip the weird kblic- deps
@@ -486,10 +487,8 @@ for repo in repos:
for pkg in dbpkgs[repo]:
if not (pkg in repopkgs.keys() and repopkgs[pkg].repo == repo):
dbonly.append("%s/%s" % (repo,pkg))
-dbonly.sort()
for name,pkg in repopkgs.iteritems():
if not name in dbpkgs[pkg.repo]:
absonly.append("%s/%s" % (pkg.repo,name))
-absonly.sort()
print_results()