summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2024-01-08 10:39:46 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2024-01-08 10:40:10 +0100
commit10367ebb0f44cbc61b48fb99e194301c2182fe31 (patch)
treef8c81784ffe21ae582796eaab33bd61fe388e637
parent719676d84b4bcdc5c65b87d42c4b72812209832b (diff)
Revert "Merge branch 'distclean-doc-an-test' into 'main'"
This reverts commit 86e6eace1d50527b5a2396290acd1db819b13e26, reversing changes made to 6e43eef9ca8250eb561f2c9af2f4890d674f3911.
-rw-r--r--doc/apt-get.8.xml8
-rwxr-xr-xtest/integration/test-apt-get-clean9
2 files changed, 1 insertions, 16 deletions
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 0e5092f57..bb7678e34 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -14,7 +14,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>2023-12-15T00:00:00Z</date>
+ <date>2023-07-20T00:00:00Z</date>
</refentryinfo>
<refmeta>
@@ -250,12 +250,6 @@
erased if it is set to off.</para></listitem>
</varlistentry>
- <varlistentry><term><option>distclean</option> (and the <option>dist-clean</option> alias)</term>
- <listitem><para>Like <literal>clean</literal>, <literal>distclean</literal> clears out the local
- repository of retrieved package files, plus all list files except Release,
- Release.gpg, and InRelease.</para></listitem>
- </varlistentry>
-
<varlistentry><term><option>autoremove</option> (and the <option>auto-remove</option> alias since 1.1)</term>
<listitem><para><literal>autoremove</literal> is used to remove packages that were automatically
installed to satisfy dependencies for other packages and are now no longer needed.</para></listitem>
diff --git a/test/integration/test-apt-get-clean b/test/integration/test-apt-get-clean
index cb49f9b35..32dd3e852 100755
--- a/test/integration/test-apt-get-clean
+++ b/test/integration/test-apt-get-clean
@@ -38,9 +38,6 @@ done
# generate some dirt and clean it up
generatedirt() {
touch rootdir/var/lib/apt/lists/partial/http.debian.net_debian_dists_sid_main_i18n_Translation-en
- touch rootdir/var/lib/apt/lists/deb.debian.org_debian_dists_sid_InRelease
- touch rootdir/var/lib/apt/lists/deb.debian.org_debian_dists_sid_main_binary-amd64_Packages
- touch rootdir/var/lib/apt/lists/deb.debian.org_debian_dists_sid_main_binary-amd64_Packages.diff_Index
mkdir -p rootdir/var/cache/apt/archives/lost+found
touch rootdir/var/cache/apt/archives/foo_1_all.deb
touch rootdir/var/cache/apt/archives/foo_1%3a1_all.deb
@@ -70,12 +67,6 @@ testfailure test -e rootdir/var/cache/apt/archives/foo_2_all.deb
testfailure test -e rootdir/var/cache/apt/archives/foo_3_all.deb
testfailure test -e rootdir/var/cache/apt/archives/foo_4_all.deb
-generatedirt
-testsuccess aptget distclean
-testsuccess test -e rootdir/var/lib/apt/lists/deb.debian.org_debian_dists_sid_InRelease
-testfailure test -e rootdir/var/lib/apt/lists/deb.debian.org_debian_dists_sid_main_binary-amd64_Packages
-testfailure test -e rootdir/var/lib/apt/lists/deb.debian.org_debian_dists_sid_main_binary-amd64_Packages.diff_Index
-
if [ "$(id -u)" != '0' ]; then
msgmsg 'No clean if lock can not be acquired'
touch rootdir/var/cache/apt/archives/foo_4_all.deb