~apachelogger/software-properties/python-apt-is-like

« back to all changes in this revision

Viewing changes to softwareproperties/SoftwareProperties.py

  • Committer: Harald Sitter
  • Date: 2016-11-09 12:32:22 UTC
  • Revision ID: sitter@kde.org-20161109123222-gu354dsfsel6bknk
* Use is_like from python-apt to determine whether or not distros
  are compatible. This act as additional constraint to the changes
  introduced in 0.96.24.2 enforcing higher accuracy on whether a
  derivate ought to be considered compatible or not.
  + Bump python-apt requirement to 1.1.0~beta5 to have is_like.

Show diffs side-by-side

added added

removed removed

Lines of Context:
675
675
    /usr/share/app-install/channels or it is a public Launchpad PPA.
676
676
    """
677
677
    (srcline, _fname) = shortcut.expand(
678
 
        codename=self.distro.codename, distro=self.distro.id.lower())
 
678
        codename=self.distro.codename, distro=self.distro.id.lower(),
 
679
        distro_is_like=self.distro.is_like)
679
680
    channel = self._is_line_in_whitelisted_channel(srcline)
680
681
    if channel:
681
682
      keyp = "%s/%s.key" % (self.CHANNEL_PATH, channel)
726
727
    """
727
728
 
728
729
    (deb_line, file) = shortcut.expand(
729
 
        codename=self.distro.codename, distro=self.distro.id.lower())
 
730
        codename=self.distro.codename, distro=self.distro.id.lower(),
 
731
        distro_is_like=self.distro.is_like)
730
732
    deb_line = self.expand_http_line(deb_line)
731
733
    debsrc_entry_type = 'deb-src' if enable_source_code else '# deb-src'
732
734
    debsrc_line = debsrc_entry_type + deb_line[3:]