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

Nick Rosbrook mp+469656 at code.launchpad.net
Mon Aug 12 12:21:55 UTC 2024


Review: Needs Information



Diff comments:

> diff --git a/add-apt-repository b/add-apt-repository
> index 8dc338f..124cdaa 100755
> --- a/add-apt-repository
> +++ b/add-apt-repository
> @@ -231,12 +236,14 @@ class AddAptRepository(object):
>              else:
>                  comps = ['main', 'restricted']
>  
> -            entry = sources.add(
> +            entry = self.sourceslist.add(

I see you already merged this. But could you then just use self.sourceslist all the time instead of having these methods accept a `sources` argument? The mixing of the two is a bit confusing.

>                  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))
>  


-- 
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.




More information about the Ubuntu-reviews mailing list