Merge lp:~juliank/software-properties/add-apt-repository-run-update into lp:software-properties

[Julian Andres Klode]

This automatically runs apt-get update after adding repositories. While SoftwareProperties can already do updates, it only does them for shortcuts, not for enabling components. It also shows no progress or anything.

We could modify it to run always and show progress, but this seems like it could cause potential problems when the same code is used elsewhere, for example in the dbus client.

Also, the Python text progress implementation might have problems not in the C++ version, so it's best to just execvp() apt-get when we're done.

[lp:~juliank/software-properties/add-apt-repository-run-update]

1005. By Julian Andres Klode on 2018-01-16

releasing package software-properties version 0.96.24.20

[Julian Andres Klode (juliank)]

Optimally we would only update the source we have added. But this is problematic if the source shares the same Release file with an existing source (everything with the same Release file needs to be updated together). Figuring out which entries share the same Release file, and then creating a temporary sources.list to update only them would be possible, but it seems a bit too fragile.

[Balint Reczey (rbalint)]

review: Needs Information

[lp:~juliank/software-properties/add-apt-repository-run-update]

1006. By Julian Andres Klode on 2018-01-16

Address review comments

[Balint Reczey (rbalint)]

review: Approve

[Steve Langasek (vorlon)]

Should we execvp() without a path? That is generally consistent with Debian policy.

review: Approve

[Julian Andres Klode (juliank)]

Ugh, forgot about the path thing. sigh. Will commit for someone else to pick up :)

=== modified file 'add-apt-repository'
--- add-apt-repository	2017-09-06 22:36:49 +0000
+++ add-apt-repository	2018-01-16 11:38:23 +0000
@@ -69,10 +69,22 @@
     parser.add_option("-y", "--yes", action="store_true",
         dest="assume_yes", default=False,
         help=_("Assume yes to all queries"))
+    parser.add_option("-n", "--no-update", action="store_false",
+        dest="update", default=True,
+        help=_("Do not update package cache after adding"))
     parser.add_option("-u", "--update", action="store_true",
-        dest="update", default=False,
-        help=_("Update package cache after adding"))
+        dest="update", default=True,
+        help=_("Update package cache after adding (legacy option)"))
     (options, args) = parser.parse_args()
+    
+    # We prefer to run apt-get update here. The built-in update support
+    # does not have any progress, and only works for shortcuts. Moving
+    # it to something like save() and using apt.progress.text would
+    # solve the problem, but the new errors might cause problems with
+    # the dbus server or other users of the API. Also, it's unclear
+    # how good the text progress is or how to pass it best.
+    update = options.update
+    options.update = False
 
     if os.geteuid() != 0:
         print(_("Error: must run as root"))
@@ -114,6 +126,8 @@
                 print(_("'%s' distribution component is already enabled for all sources.") % line)
                 sys.exit(0)
         sp.sourceslist.save()
+        if update and not options.remove:
+            os.execvp("/usr/bin/apt-get", ["apt-get", "update"])
         sys.exit(0)
 
     # this wasn't a component name ('multiverse', 'backports'), so its either
@@ -177,3 +191,6 @@
             sys.exit(1)
 
         sp.sourceslist.save()
+        if update and not options.remove:
+            os.execvp("/usr/bin/apt-get", ["apt-get", "update"])
+        sys.exit(0)

=== modified file 'debian/changelog'
--- debian/changelog	2017-12-20 20:55:27 +0000
+++ debian/changelog	2018-01-16 11:38:23 +0000
@@ -1,3 +1,9 @@
+software-properties (0.96.24.20) bionic; urgency=medium
+
+  * add-apt-repository: Run apt-get update after adding sources.
+
+ -- Julian Andres Klode <[e-mail]>  Tue, 16 Jan 2018 09:58:55 +0100
+
 software-properties (0.96.24.19) bionic; urgency=medium
 
   * tests: Clear configuration before running init() again