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

« back to all changes in this revision

Viewing changes to softwareproperties/SoftwareProperties.py

  • Committer: Dimitri John Ledkov
  • Date: 2016-09-23 10:47:57 UTC
  • Revision ID: xnox@ubuntu.com-20160923104757-jzmvj0if90o2jwhi
Tags: 0.96.24.7
Fix up mis-merged changelog

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(),
679
 
        distro_is_like=self.distro.is_like)
 
678
        codename=self.distro.codename, distro=self.distro.id.lower())
680
679
    channel = self._is_line_in_whitelisted_channel(srcline)
681
680
    if channel:
682
681
      keyp = "%s/%s.key" % (self.CHANNEL_PATH, channel)
727
726
    """
728
727
 
729
728
    (deb_line, file) = shortcut.expand(
730
 
        codename=self.distro.codename, distro=self.distro.id.lower(),
731
 
        distro_is_like=self.distro.is_like)
 
729
        codename=self.distro.codename, distro=self.distro.id.lower())
732
730
    deb_line = self.expand_http_line(deb_line)
733
731
    debsrc_entry_type = 'deb-src' if enable_source_code else '# deb-src'
734
732
    debsrc_line = debsrc_entry_type + deb_line[3:]