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

« back to all changes in this revision

Viewing changes to softwareproperties/ppa.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:
395
395
    def info(self):
396
396
        return self._info
397
397
 
398
 
    def expand(self, codename, distro=None, distro_is_like=[]):
 
398
    def expand(self, codename, distro=None):
399
399
        if (distro is not None
400
400
                and distro != self._info["distribution"]
401
 
                and not series_valid_for_distro(self._info["distribution"], codename)
402
 
                and not self._info["distribution"] in distro_is_like):
 
401
                and not series_valid_for_distro(self._info["distribution"], codename)):
403
402
            # The requested PPA is for a foreign distribution.  Guess that
404
403
            # the user wants that distribution's current series.
405
404
            # This only applies if the local distribution is not the same