Merge lp:~evfool/software-properties/lp1170114 into lp:software-properties

[Robert Roth]

As we have add-apt-repository as the command line tool for adding/removing/enabling/disabling PPAs and distro components, I would suggest removing the command-line switch for enabling a component from software-properties-gtk to avoid duplication of code and functionality within the same project.

[Michael Vogt (mvo)]

On Tue, Jun 18, 2013 at 07:52:30PM -0000, Robert Roth wrote:
> Robert Roth has proposed merging lp:~evfool/software-properties/lp1170114 into lp:software-properties.
>
> Requested reviews:
> Ubuntu Core Development Team (ubuntu-core-dev)
> Related bugs:
> Bug #1170114 in software-properties (Ubuntu): "Add --disable-component option"
> https://bugs.launchpad.net/ubuntu/+source/software-properties/+bug/1170114
>
> For more details, see:
> https://code.launchpad.net/~evfool/software-properties/lp1170114/+merge/170185
>
> As we have add-apt-repository as the command line tool for adding/removing/enabling/disabling PPAs and distro components, I would suggest removing the command-line switch for enabling a component from software-properties-gtk to avoid duplication of code and functionality within the same project.

Thanks Robert! I think removing duplication is a good idea, but
instead of removing it entirely I would suggest that we add a message
to the user what the replacement interface is what how its used.

Thanks,
 Michael

[Robert Roth (evfool)]

I have also though about that after I have proposed the merge. I'll update this proposal with a message to use add-apt-repository instead, with an example invocation.

[Robert Roth (evfool)]

Branch updated, please check if it's ok for you.

[Michael Vogt (mvo)]

On Wed, Jun 19, 2013 at 07:44:28AM -0000, Robert Roth wrote:
> Robert Roth has proposed merging lp:~evfool/software-properties/lp1170114 into lp:software-properties.
>
> Requested reviews:
> Ubuntu Core Development Team (ubuntu-core-dev)
> Related bugs:
> Bug #1170114 in software-properties (Ubuntu): "Add --disable-component option"
> https://bugs.launchpad.net/ubuntu/+source/software-properties/+bug/1170114
>
> For more details, see:
> https://code.launchpad.net/~evfool/software-properties/lp1170114/+merge/170185
>
> As we have add-apt-repository as the command line tool for adding/removing/enabling/disabling PPAs and distro components, I would suggest removing the command-line switch for enabling a component from software-properties-gtk to avoid duplication of code and functionality within the same project.
> --
> https://code.launchpad.net/~evfool/software-properties/lp1170114/+merge/170185
> You are subscribed to branch lp:software-properties.

Thanks, I think this is good now. +1

[Robert Roth (evfool)]

In that case I'd appreciate a merge, as I'm not a member of the Ubuntu Core Dev Team :)

[Martin Pitt (pitti)]

merged with a changelog entry, thanks!

review: Approve

=== modified file 'software-properties-gtk'
--- software-properties-gtk	2012-06-21 21:00:08 +0000
+++ software-properties-gtk	2013-06-19 07:34:26 +0000
@@ -57,7 +57,7 @@
                     action="store", type="string", dest="toplevel",
                     help="Set x-window-id of the toplevel parent for the "\
                     "dialog (useful for embedding)")
-  parser.add_option("-e", "--enable-component", 
+  parser.add_option("-e", "--enable-component",
                     action="store", type="string", dest="enable_component",
                     help="Enable the specified component of the distro's "\
                     "repositories")
@@ -94,11 +94,9 @@
     app.add_source_from_line("ppa:%s" % options.enable_ppa)
     app.sourceslist.save()
   elif options.enable_component:
-    sourceslist = SourcesList()
-    distro = aptsources.distro.get_distro()
-    distro.get_sources(sourceslist)
-    distro.enable_component(options.enable_component)
-    sourceslist.save()
+    print(_("The --enable-component/-e command-line switch has been deprecated. "
+            "Instead of 'software-properties-gtk -e multiverse' you can use \n'add-apt-repository multiverse'"))
+    sys.exit(1)
   else:
     app = SoftwarePropertiesGtk(datadir=options.data_dir, options=options, file=file)
     app.run()