Fix crash in source_package.py

lib/naclports/source_package.py

 # Copyright (c) 2014 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import contextlib
 import fnmatch
 import os
 import re
 import subprocess
 import sys
 import tempfile
 import time
 import urlparse
 
 from naclports import binary_package
 from naclports import configuration
 from naclports import package
 from naclports import package_index
+from naclports import installed_package
 from naclports import util
 from naclports import paths
 from naclports import bsd_pkg
 from naclports.util import Log, Trace, LogVerbose
 from naclports.error import Error, DisabledError, PkgFormatError
 
 
 class PkgConflictError(Error):
   pass
 
@@ skipping 253 matching lines @@
       self.Build(build_deps, force)
 
     if self.IsAnyVersionInstalled():
       installed_pkg = self.GetInstalledPackage()
       installed_pkg.LogStatus('Uninstalling existing')
       installed_pkg.DoUninstall(force=True)
 
     binary_package.BinaryPackage(package_file).Install(force)
 
   def GetInstalledPackage(self):
-    return package.CreateInstalledPackage(self.NAME, self.config)
+    return installed_package.CreateInstalledPackage(self.NAME, self.config)
 
   def CreatePkgFile(self):
     """Create and pkg file for use with the FreeBSD pkg tool.
 
     Create a package from the result of the package's InstallStep.
     """
     install_dir = self.GetInstallLocation()
     if not os.path.exists(install_dir):
       Log('Skiping pkg creation. Install dir not found: %s' % install_dir)
       return
@@ skipping 484 matching lines @@
   if os.path.isdir(package_name):
     return SourcePackage(package_name, config)
 
   for subdir in DEFAULT_LOCATIONS:
     pkg_root = os.path.join(paths.NACLPORTS_ROOT, subdir, package_name)
     info = os.path.join(pkg_root, 'pkg_info')
     if os.path.exists(info):
       return SourcePackage(pkg_root, config)
 
   raise Error("Package not found: %s" % package_name)