← Back to branch summary

~ubuntuone-control-tower/software-center/trunk

« back to all changes in this revision

Viewing changes to softwarecenter/view/appdetailsview_gtk.py

  • Committer: Michael Vogt
  • Date: 2010-09-08 16:45:24 UTC
  • mfrom: (1133.1.4 trunk)
  • Revision ID: michael.vogt@ubuntu.com-20100908164524-tnxmg8iz2yrco63e
merged from  lp:~mvo/software-center/fix-conflicting-packages  

Show diffs side-by-side

added added

removed removed

Lines of Context:
softwarecenter/view/appdetailsview_gtk.py
1654
1654
        version = pkg.installed
1655
1655
        if version == None:
1656
1656
            version = max(pkg.versions)
1657
 
            deps_inst = self.cache.get_all_deps_installing(pkg)
 
1657
            deps_inst = self.cache.try_install_and_get_all_deps_installed(pkg)
1658
1658
            for dep in deps_inst:
1659
1659
                if self.cache[dep].installed == None:
1660
1660
                    dep_version = max(self.cache[dep].versions)
1661
1661
                    pkgs_to_install.append(dep_version)
1662
 
            deps_remove = self.cache.get_all_deps_removing(pkg)
 
1662
            deps_remove = self.cache.try_install_and_get_all_deps_removed(pkg)
1663
1663
            for dep in deps_remove:
1664
 
                if self.cache[dep].installed != None:
 
1664
                if self.cache[dep].is_installed:
1665
1665
                    dep_version = self.cache[dep].installed
1666
1666
                    pkgs_to_remove.append(dep_version)
1667
1667
            pkgs_to_install.append(version)
1669
1669
        for addon in self.addons_manager.addons_to_install:
1670
1670
            version = max(self.cache[addon].versions)
1671
1671
            pkgs_to_install.append(version)
1672
 
            deps_inst = self.cache.get_all_deps_installing(self.cache[addon])
 
1672
            deps_inst = self.cache.try_install_and_get_all_deps_installed(self.cache[addon])
1673
1673
            for dep in deps_inst:
1674
1674
                if self.cache[dep].installed == None:
1675
1675
                    version = max(self.cache[dep].versions)
1676
1676
                    pkgs_to_install.append(version)
1677
 
            deps_remove = self.cache.get_all_deps_removing(self.cache[addon])
 
1677
            deps_remove = self.cache.try_install_and_get_all_deps_removed(self.cache[addon])
1678
1678
            for dep in deps_remove:
1679
1679
                if self.cache[dep].installed != None:
1680
1680
                    version = self.cache[dep].installed
1682
1682
        for addon in self.addons_manager.addons_to_remove:
1683
1683
            version = self.cache[addon].installed
1684
1684
            pkgs_to_remove.append(version)
1685
 
            deps_inst = self.cache.get_all_deps_installing(self.cache[addon])
 
1685
            deps_inst = self.cache.try_install_and_get_all_deps_installed(self.cache[addon])
1686
1686
            for dep in deps_inst:
1687
1687
                if self.cache[dep].installed == None:
1688
1688
                    version = max(self.cache[dep].versions)
1689
1689
                    pkgs_to_install.append(version)
1690
 
            deps_remove = self.cache.get_all_deps_removing(self.cache[addon])
 
1690
            deps_remove = self.cache.try_install_and_get_all_deps_removed(self.cache[addon])
1691
1691
            for dep in deps_remove:
1692
1692
                if self.cache[dep].installed != None:
1693
1693
                    version = self.cache[dep].installed