[Merge] ~juliank/software-properties:deb822-add-remove-pocket-component into software-properties:ubuntu/master

[Julian Andres Klode]

Hmm I found stuck comments so saving them

Diff comments:

> diff --git a/add-apt-repository b/add-apt-repository
> index 8dc338f..124cdaa 100755
> --- a/add-apt-repository
> +++ b/add-apt-repository
> @@ -27,14 +27,15 @@ from gettext import gettext as _
>  
>  apt_pkg.init()
>  
> -SOURCESLIST = apt_pkg.config.find_file("Dir::Etc::sourcelist")
> -
> +SOURCESLIST = apt_pkg.config.find_dir("Dir::Etc::sourceparts") + get_distro().id.lower() + ".sources"

Yes it does, it's designed to just concatenate a file to it

> +if not os.path.exists(SOURCESLIST):
> +    SOURCESLIST = apt_pkg.config.find_file("Dir::Etc::sourcelist")
>  
>  class AddAptRepository(object):
>      def __init__(self):
>          gettext.textdomain("software-properties")
>          self.distro = get_distro()
> -        self.sourceslist = SourcesList()
> +        self.sourceslist = SourcesList(deb822=True)
>          self.distro.get_sources(self.sourceslist)
>  
>      def parse_args(self, args):
> @@ -231,12 +236,14 @@ class AddAptRepository(object):
>              else:
>                  comps = ['main', 'restricted']
>  
> -            entry = sources.add(
> +            entry = self.sourceslist.add(

Yes, the exploded list has no add method

>                  type=self.binary_type,
>                  uri=uri,
>                  dist='{}-{}'.format(suite, self.pocket),
>                  orig_comps=comps,
> -                file=SOURCESLIST
> +                file=SOURCESLIST,
> +                comment="Added by software-properties",
> +                parent=entries[0] if entries else None,
>              )
>              print(_("Adding: %s") % str(entry))
>  
> @@ -248,21 +255,22 @@ class AddAptRepository(object):
>              if get_source_entry_pocket(entry) != self.pocket:
>                  continue
>  
> -            entry.set_enabled(False)
> -            print(_("Disabled: %s") % str(entry))
> +            self.sourceslist.remove(entry)

Yes same here, we need to call remove on sourceslist to remove the exploded child.

> +            print(_("Removed: %s") % str(entry))
>  
>      def change_pocket(self):
> +        exploded = self.sourceslist.exploded_list()
>          if self.options.remove:
> -            self._remove_pocket(self.sourceslist)
> +            self._remove_pocket(exploded)
>          else:
> -            self._add_pocket(self.sourceslist)
> +            self._add_pocket(exploded)
>  
>          if not self.dry_run:
>              self.sourceslist.save()
>  
>      def _enable_source(self):
>          # Check each disabled deb-src line, enable if matching deb line exists
> -        for s in self.sourceslist:
> +        for s in self.sourceslist.exploded_list():
>              if s.invalid or not s.disabled or s.type != self.source_type:
>                  continue
>  


-- 
https://code.launchpad.net/~juliank/software-properties/+git/software-properties/+merge/469656
Your team Ubuntu Core Development Team is subscribed to branch software-properties:ubuntu/master.