--- a/src/modules/client/image.py	Mon Feb 25 17:56:58 2008 -0800
+++ b/src/modules/client/image.py	Mon Feb 25 18:27:21 2008 -0800
@@ -454,7 +454,9 @@
 
                 v = self._get_version_installed(fmri)
 
-                if fmri.authority == None:
+                if v and fmri.authority == None:
+                        fmri.authority = v.authority
+                elif fmri.authority == None:
                         fmri.authority = self.get_default_authority()
 
                 if v and self.fmri_is_successor(v, fmri):
@@ -488,6 +490,8 @@
 
                 v = self._get_version_installed(fmri)
 
+                assert fmri.authority
+
                 if v:
                         return v
                 else:

--- a/src/modules/version.py	Mon Feb 25 17:56:58 2008 -0800
+++ b/src/modules/version.py	Mon Feb 25 18:27:21 2008 -0800
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #