--- a/src/modules/portable/os_windows.py	Wed Oct 22 11:13:12 2008 -0500
+++ b/src/modules/portable/os_windows.py	Wed Oct 22 11:15:45 2008 -0500
@@ -135,12 +135,13 @@
         The image is cached in the module variable cached_image.
         """
         import pkg.client.image as image
+        import pkg.client.api_errors as api_errors
         global cached_image    
         if not cached_image or not path.startswith(cached_image.get_root()):
                 cached_image = image.Image()
                 try:
                         cached_image.find_root(os.path.dirname(path))
-                except ValueError:
+                except api_errors.ImageNotFoundException:
                         # if path is not within an image, revert to the 
                         # initial state
                         cached_image = None

--- a/src/setup.py	Wed Oct 22 11:13:12 2008 -0500
+++ b/src/setup.py	Wed Oct 22 11:15:45 2008 -0500
@@ -472,9 +472,17 @@
 
 
 # These are set to real values based on the platform, down below
-ext_modules = None
 compile_args = None
 link_args = None
+ext_modules = [
+        Extension(
+                'actions._actions',
+                _actions_srcs,
+                include_dirs = include_dirs,
+                extra_compile_args = compile_args,
+                extra_link_args = link_args
+                ),
+        ]
 elf_libraries = None
 data_files = [ (resource_dir, web_files) ]
 cmdclasses = {
@@ -507,7 +515,7 @@
         # Unix platforms which the elf extension has been ported to
         # are specified here, so they are built automatically
         elf_libraries = ['elf']
-        ext_modules = [
+        ext_modules += [
                 Extension(
                         'elf',
                         elf_srcs,
@@ -516,13 +524,6 @@
                         extra_compile_args = compile_args,
                         extra_link_args = link_args
                         ),
-                Extension(
-                        'actions._actions',
-                        _actions_srcs,
-                        include_dirs = include_dirs,
-                        extra_compile_args = compile_args,
-                        extra_link_args = link_args
-                        ),
                 ]
 
         # Solaris has built-in md library and Solaris-specific arch extension

--- a/src/tests/api/t_unix_usergrp.py	Wed Oct 22 11:13:12 2008 -0500
+++ b/src/tests/api/t_unix_usergrp.py	Wed Oct 22 11:15:45 2008 -0500
@@ -164,6 +164,9 @@
 
         def testUser3(self):
                 """ Test with an oddball/corrupt passwd file """
+                if not os.path.exists("/etc/passwd"):
+                        return
+
                 passwd = file(os.path.join(self.tempdir, "etc", "passwd"), "w")
                 passwd.write( \
 """root:x:0:0::/root:/usr/bin/bash