launchpad-reviewers team mailing list archive

[Andrey Fedoseev <mp+422364@xxxxxxxxxxxxxxxxxx>]

Andrey Fedoseev has proposed merging ~andrey-fedoseev/launchpad:change-apt-get-to-apt into launchpad:master.

Commit message:
LP-713: Replace "apt-get" with "apt" everywhere

This includes:

 - UI and tests
 - Documentation
 - `rocketfuel-setup` script

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~andrey-fedoseev/launchpad/+git/launchpad/+merge/422364

Replace "apt-get" with "apt" everywhere

This includes:

 - UI and tests
 - Documentation
 - `rocketfuel-setup` script

Related bug report https://bugs.launchpad.net/launchpad/+bug/1724304

Since Ubuntu 16.04, `apt` is recommended over `apt-get`. However, LaunchPad still shows `apt-get` in several places, for example, in the "Adding this PPA to your system" screen, screenshot attached. There are probably other places on LaunchPad where `apt-get` is still used, too.

-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~andrey-fedoseev/launchpad:change-apt-get-to-apt into launchpad:master.

diff --git a/doc/how-to/running.rst b/doc/how-to/running.rst
index 0333abd..a653fdd 100644
--- a/doc/how-to/running.rst
+++ b/doc/how-to/running.rst
@@ -181,7 +181,7 @@ off.
 
 .. code-block:: shell-session
 
-   $ sudo apt-get dist-upgrade
+   $ sudo apt dist-upgrade
 
 This is just to make doubly-sure everything from the Launchpad PPA gets
 installed.
diff --git a/doc/malone.rst b/doc/malone.rst
index 1edf93a..64608fe 100644
--- a/doc/malone.rst
+++ b/doc/malone.rst
@@ -33,7 +33,7 @@ source community::
   upstream, build it and install it locally. They will install a package
   that has already been prepared for the specific platform they are running
   on. For example, on Gentoo, they will type "emerge foo". On Ubuntu, they
-  would type "apt-get install foo". And on RedHat they would install a
+  would type "apt install foo". And on RedHat they would install a
   custom RPM. So the same software code is being repackaged many times, for
   Gentoo, Ubuntu, RedHat, and many other platforms.
 
diff --git a/lib/lp/answers/browser/tests/views.txt b/lib/lp/answers/browser/tests/views.txt
index 93b8aff..d81bc98 100644
--- a/lib/lp/answers/browser/tests/views.txt
+++ b/lib/lp/answers/browser/tests/views.txt
@@ -188,7 +188,7 @@ The other user can come back and gives an answer:
     >>> workflow_harness.submit(
     ...     'answer', {
     ...         'field.message': "New version of the firefox package are "
-    ...             "available with SVG support enabled. Using apt-get or "
+    ...             "available with SVG support enabled. Using apt or "
     ...             "adept you should be able to upgrade."})
     >>> for notification in workflow_harness.request.response.notifications:
     ...     print(notification.message)
diff --git a/lib/lp/answers/stories/question-workflow.txt b/lib/lp/answers/stories/question-workflow.txt
index 1a0b67a..c343334 100755
--- a/lib/lp/answers/stories/question-workflow.txt
+++ b/lib/lp/answers/stories/question-workflow.txt
@@ -156,7 +156,7 @@ clicking the 'Propose Answer' button.
     ...     'http://launchpad.test/firefox/+question/2')
     >>> support_browser.getControl('Message').value = (
     ...     "New version of the firefox package are available with SVG "
-    ...     "support enabled. You can use apt-get or adept to upgrade.")
+    ...     "support enabled. You can use apt or adept to upgrade.")
     >>> support_browser.getControl('Propose Answer').click()
 
 This moves the question to the Answered state and adds the answer to
@@ -167,7 +167,7 @@ the end of the discussion:
 
     >>> print_last_comment(support_browser.contents)
     New version of the firefox package are available with SVG support
-    enabled. You can use apt-get or adept to upgrade.
+    enabled. You can use apt or adept to upgrade.
 
 
 Confirming an Answer
@@ -222,7 +222,7 @@ The confirmed answer is also highlighted.
     ...     'div', 'boardCommentBody highlighted editable-message-text'
     ... ).decode_contents())
     <p>New version of the firefox package are available with SVG support
-    enabled. You can use apt-get or adept to upgrade.</p>
+    enabled. You can use apt or adept to upgrade.</p>
 
 The History link should now show up.
 
@@ -293,7 +293,7 @@ answerer back to None.
     >>> bestAnswer.find('div', 'boardCommentBody editable-message-text')
     <div class="boardCommentBody editable-message-text"
     itemprop="commentText"><p>New version of the firefox package
-    are available with SVG support enabled. You can use apt-get or adept to
+    are available with SVG support enabled. You can use apt or adept to
     upgrade.</p></div>
 
 In addition, this creates a reopening record that is displayed in the
@@ -361,11 +361,11 @@ The answer's message is also highlighted as the best answer.
     >>> print(message)
     <div class="boardCommentBody highlighted editable-message-text"
     itemprop="commentText"><p>New version of the firefox package are
-    available with SVG support enabled. You can use apt-get or adept to
+    available with SVG support enabled. You can use apt or adept to
     upgrade.</p></div>
     >>> print(extract_text(message))
     New version of the firefox package are available with SVG support
-    enabled. You can use apt-get or adept to upgrade.
+    enabled. You can use apt or adept to upgrade.
 
 
 History
diff --git a/lib/lp/bugs/interfaces/bug.py b/lib/lp/bugs/interfaces/bug.py
index 40a2703..3a9becf 100644
--- a/lib/lp/bugs/interfaces/bug.py
+++ b/lib/lp/bugs/interfaces/bug.py
@@ -1157,13 +1157,13 @@ class IBugAddForm(IBug):
     product = Choice(
             title=_("Project"), required=False,
             description=_("""The thing you found this bug in,
-            which was installed by something other than apt-get, rpm,
+            which was installed by something other than apt, rpm,
             emerge or similar"""),
             vocabulary="Product")
     packagename = Choice(
             title=_("Package Name"), required=False,
             description=_("""The package you found this bug in,
-            which was installed via apt-get, rpm, emerge or similar."""),
+            which was installed via apt, rpm, emerge or similar."""),
             vocabulary="BinaryAndSourcePackageName")
     title = Title(title=_('Summary'), required=True)
     distribution = Choice(
diff --git a/lib/lp/registry/doc/sourcepackage.txt b/lib/lp/registry/doc/sourcepackage.txt
index 4d616cb..5ef5135 100644
--- a/lib/lp/registry/doc/sourcepackage.txt
+++ b/lib/lp/registry/doc/sourcepackage.txt
@@ -2,7 +2,7 @@ Source Packages
 ===============
 
 A source package is a thing from which binary packages are built, to
-then be installed using a package management tool like apt-get or rpm.
+then be installed using a package management tool like apt or rpm.
 One named source package in a distro may be used to build several
 different named binary packages, on one or more architectures. One named
 binary package in a distro may have been built from more than one named
diff --git a/lib/lp/soyuz/help/ppa-sources-list.html b/lib/lp/soyuz/help/ppa-sources-list.html
index 4784436..fa15da5 100644
--- a/lib/lp/soyuz/help/ppa-sources-list.html
+++ b/lib/lp/soyuz/help/ppa-sources-list.html
@@ -68,7 +68,7 @@
     </p>
 
     <p>
-      <code>sudo apt-get update</code>
+      <code>sudo apt update</code>
     </p>
 
     <p>
diff --git a/lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt b/lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt
index d8bce3c..863b44e 100644
--- a/lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt
+++ b/lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt
@@ -275,7 +275,7 @@ context PPA in their systems.
     untrusted PPA by adding ppa:cprov/ppa to your system's Software Sources.
     (Read about installing)
     sudo add-apt-repository ppa:cprov/ppa
-    sudo apt-get update
+    sudo apt update
     Technical details about this PPA
     ...
     For questions and bugs with software in this PPA please contact
diff --git a/lib/lp/soyuz/templates/archive-index.pt b/lib/lp/soyuz/templates/archive-index.pt
index 8f48a2a..f7e38b3 100644
--- a/lib/lp/soyuz/templates/archive-index.pt
+++ b/lib/lp/soyuz/templates/archive-index.pt
@@ -92,7 +92,7 @@
 
         <pre class="command subordinate" tal:condition="not: context/private">
 sudo add-apt-repository <tal:reference tal:replace="context/fmt:reference" />
-sudo apt-get update
+sudo apt update
         </pre>
 
         <div class="widget-header">
diff --git a/utilities/rocketfuel-setup b/utilities/rocketfuel-setup
index 6d18b8a..ab29385 100755
--- a/utilities/rocketfuel-setup
+++ b/utilities/rocketfuel-setup
@@ -128,14 +128,14 @@ done
 do_install() {
   if ! dpkg -s "$pkg" | grep -q "^Status: install ok installed"; then
     echo "Installing $pkg package..."
-    if ! sudo apt-get install $INSTALL_OPTS "$pkg"; then
+    if ! sudo apt install $INSTALL_OPTS "$pkg"; then
       echo "Unable to install $pkg."
       exit 1
     fi
   fi
   }
 
-sudo apt-get update
+sudo apt update
 REQUIRED_PACKAGES="launchpad-developer-dependencies apache2 libapache2-mod-wsgi"
 for pkg in $REQUIRED_PACKAGES; do
   do_install;