From: Mark Hymers <mhy@debian.org>
Date: Wed, 10 Aug 2011 19:59:27 +0000 (+0100)
Subject: Merge remote branch 'ftpmaster/master'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=63e1b5282ac70efe7cbf443273e822819f72bf23;hp=562e9142aecc36c33c8cbafe67461d423bf539b5;p=dak.git

Merge remote branch 'ftpmaster/master'
---

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 7e9ff539..a6a9e022 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -3005,11 +3005,11 @@ __all__.append('get_suite')
 
 ################################################################################
 
-# TODO: should be removed because the implementation is too trivial
 @session_wrapper
 def get_suite_architectures(suite, skipsrc=False, skipall=False, session=None):
     """
-    Returns list of Architecture objects for given C{suite} name
+    Returns list of Architecture objects for given C{suite} name. The list is
+    empty if suite does not exist.
 
     @type suite: str
     @param suite: Suite name to search for
@@ -3030,7 +3030,10 @@ def get_suite_architectures(suite, skipsrc=False, skipall=False, session=None):
     @return: list of Architecture objects for the given name (may be empty)
     """
 
-    return get_suite(suite, session).get_architectures(skipsrc, skipall)
+    try:
+        return get_suite(suite, session).get_architectures(skipsrc, skipall)
+    except AttributeError:
+        return []
 
 __all__.append('get_suite_architectures')