[Piuparts-commits] [piuparts] 10/11: dwke: use error handling and default values from lib

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit 7204993bf03a1c322b01e28fc978cdd1627d463e
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Nov 25 14:04:38 2013 +0100

    dwke: use error handling and default values from lib
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 master-bin/detect_well_known_errors.py | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/master-bin/detect_well_known_errors.py b/master-bin/detect_well_known_errors.py
index 15c1635..f615e21 100755
--- a/master-bin/detect_well_known_errors.py
+++ b/master-bin/detect_well_known_errors.py
@@ -229,11 +229,7 @@ class FailureManager():
         def keyfunc(x, pkgsdb=self.pkgsdb, logdict=self.logdict):
 
             pkg_obj = pkgsdb.get_package(get_pkg(x.pkgspec))
-
-            if not pkg_obj is None:
-                rdeps = pkgsdb.rrdep_count(pkg_obj)
-            else:
-                rdeps = 0
+            rdeps = pkgsdb.rrdep_count(pkg_obj)
 
             is_failed = get_where(logdict[x.pkgspec]) == "fail"
 
@@ -376,13 +372,12 @@ def update_tpl(basedir, section, problem, failures, logdict, ftpl, ptpl, pkgsdb)
         bin_pkg = get_pkg(pkgspec)
 
         pkg_obj = pkgsdb.get_package(bin_pkg)
+        rdep_cnt = pkgsdb.rrdep_count(pkg_obj)
 
         if not pkg_obj is None:
             src_pkg = source_pkg(pkgspec, pkgsdb)
-            rdep_cnt = pkgsdb.rrdep_count(pkgsdb.get_package(bin_pkg))
         else:
             src_pkg = bin_pkg
-            rdep_cnt = 0
 
         if bugged_section is False and get_where(logdict[pkgspec]) != 'fail':
             bugged_section = True
@@ -433,11 +428,7 @@ def update_html(section, logdict, problem_list, failures, config, pkgsdb):
     def keyfunc(x, pkgsdb=pkgsdb, logdict=logdict):
 
         pkg_obj =  pkgsdb.get_package(get_pkg(x.pkgspec))
-
-        if not pkg_obj is None:
-            rdeps = pkgsdb.rrdep_count(pkg_obj)
-        else:
-            rdeps = 0
+        rdeps = pkgsdb.rrdep_count(pkg_obj)
 
         is_failed = get_where(logdict[x.pkgspec]) == "fail"
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git