suggest 'apt autoremove' to get right of unneeded packages

The bugreport is more conservative in asking for a conditional, but
given that this is a message intended to be read by users to be run by
users we should suggest using a command intended to be used by users.

And while we are at, add sudo to the message – conditional of course.

Closes: 801571

diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index a9d93a92abb4cfb75e30dbbc74b63ad80a4e9136..dda5b50bec6bba31347e80c6d0002714ca3c9247 100644 (file)
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@ -484,7 +484,11 @@ static bool DoAutomaticRemove(CacheFile &Cache)
       else
         ioprintf(c1out, P_("%lu package was automatically installed and is no longer required.\n",
                  "%lu packages were automatically installed and are no longer required.\n", autoRemoveCount), autoRemoveCount);
-      c1out << P_("Use 'apt-get autoremove' to remove it.", "Use 'apt-get autoremove' to remove them.", autoRemoveCount) << std::endl;
+      std::string autocmd = "apt autoremove";
+      if (getenv("SUDO_USER") != NULL)
+        autocmd = "sudo " + autocmd;
+      ioprintf(c1out, P_("Use '%s' to remove it.", "Use '%s' to remove them.", autoRemoveCount), autocmd.c_str());
+      c1out << std::endl;
    }
    return true;
 }

diff --git a/po/apt-all.pot b/po/apt-all.pot
index bfccc2beb1a6fac4f01628df89ce7adff9f3644c..07904688f0b71720261facd8e06334f7305f9e09 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -377,8 +377,8 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

diff --git a/po/ar.po b/po/ar.po
index 55142455aac1dea5d72ca5d2e1c7720fb13dcd9a..f8001d8aeba9e320d98a43da332cae86db1c9afc 100644 (file)
--- a/po/ar.po
+++ b/po/ar.po
@@ -394,8 +394,8 @@ msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:"
 msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

diff --git a/po/ast.po b/po/ast.po
index e8a7807fd4795d3ea8278822b29e1746590da556..cf9f20693b915efaafeedbd2e037f449ef83b6b6 100644 (file)
--- a/po/ast.po
+++ b/po/ast.po
@@ -402,10 +402,10 @@ msgstr[1] ""
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Usa 'apt-get autoremove' pa desinstalalos."
-msgstr[1] "Usa 'apt-get autoremove' pa desinstalalos."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Usa '%s' pa desinstalalos."
+msgstr[1] "Usa '%s' pa desinstalalos."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/bg.po b/po/bg.po
index eeab54852f560c899681848107533fe5868c122c..ba271dc9e7af16ce154e5719fbba54fcfa9585ee 100644 (file)
--- a/po/bg.po
+++ b/po/bg.po
@@ -413,10 +413,10 @@ msgstr[1] ""
 "%lu пакета са били инсталирани автоматично и вече не са необходими:\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Използвайте „apt-get autoremove“ за да го премахнете."
-msgstr[1] "Използвайте „apt-get autoremove“ за да ги премахнете."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Използвайте „%s“ за да го премахнете."
+msgstr[1] "Използвайте „%s“ за да ги премахнете."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/bs.po b/po/bs.po
index 50f116f6121c587cec0f6e47a4941da209b50216..8b893ca28aba92a600821b5678070ba2b5cab8ce 100644 (file)
--- a/po/bs.po
+++ b/po/bs.po
@@ -382,8 +382,8 @@ msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
 msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

diff --git a/po/ca.po b/po/ca.po
index 1d0efdb2031ae083e088d8463fa2bdb534bcfb50..04d2d3b7e048f7a6796b29c6104d7948272687fa 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -413,10 +413,10 @@ msgstr[1] ""
 "Els paquets %lu es van s'instaŀlar automàticament i ja no són necessaris:\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Empreu «apt-get autoremove» per a suprimir-lo."
-msgstr[1] "Empreu «apt-get autoremove» per a suprimir-los."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Empreu «%s» per a suprimir-lo."
+msgstr[1] "Empreu «%s» per a suprimir-los."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/cs.po b/po/cs.po
index 0f19070ae1cb6eeec4d9379fe7d36c4896e153da..1903cf46e53eb044d5cf4c4962cef2270b7f5400 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -410,11 +410,11 @@ msgstr[1] "%lu balíky byly nainstalovány automaticky a již nejsou potřeba.\n
 msgstr[2] "%lu balíků bylo nainstalováno automaticky a již nejsou potřeba.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Pro jeho odstranění použijte „apt-get autoremove“."
-msgstr[1] "Pro jejich odstranění použijte „apt-get autoremove“."
-msgstr[2] "Pro jejich odstranění použijte „apt-get autoremove“."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Pro jeho odstranění použijte „%s“."
+msgstr[1] "Pro jejich odstranění použijte „%s“."
+msgstr[2] "Pro jejich odstranění použijte „%s“."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/cy.po b/po/cy.po
index fa89ef567c9c7c9964fe8cd50810c62d437e4be8..bfa87eaccf3152e71aa9a367aefcdd8296b6d650 100644 (file)
--- a/po/cy.po
+++ b/po/cy.po
@@ -401,8 +401,8 @@ msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

diff --git a/po/da.po b/po/da.po
index 76e90e881d0a6a6bf124c8cd67c68607b2a929fa..6f1f2b6de15e0776dc4a976bc9a19d15b2be13f4 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -407,10 +407,10 @@ msgstr[1] ""
 "Pakkerne %lu blev installeret automatisk, og behøves ikke længere.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Brug »apt-get autoremove« til at fjerne den."
-msgstr[1] "Brug »apt-get autoremove« til at fjerne dem."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Brug »%s« til at fjerne den."
+msgstr[1] "Brug »%s« til at fjerne dem."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/de.po b/po/de.po
index 2816b3f41ea2c4c65401ce43ccf3f9fd58389d9e..48ab181a1841776f51fb654296fb3c834edffcbb 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -415,10 +415,10 @@ msgstr[1] ""
 "%lu Pakete wurden automatisch installiert und werden nicht mehr benötigt.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Verwenden Sie »apt-get autoremove«, um es zu entfernen."
-msgstr[1] "Verwenden Sie »apt-get autoremove«, um sie zu entfernen."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Verwenden Sie »%s«, um es zu entfernen."
+msgstr[1] "Verwenden Sie »%s«, um sie zu entfernen."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/dz.po b/po/dz.po
index 13ee3dcdc0a620692cd10fc989e825f1d6894a62..6c96e2a8ac9f6987fb8bb14679cf634e319ab650 100644 (file)
--- a/po/dz.po
+++ b/po/dz.po
@@ -404,8 +404,8 @@ msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འ
 msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

diff --git a/po/el.po b/po/el.po
index a15ec72019b83580092b51c22d0b0e6ec51a060b..f52dca6d528e5210cd41457ed41362ca41ea2b89 100644 (file)
--- a/po/el.po
+++ b/po/el.po
@@ -418,10 +418,10 @@ msgstr[1] ""
 "%lu τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Χρησιμοποιήστε 'apt-get autoremove' για να το διαγράψετε."
-msgstr[1] "Χρησιμοποιήστε 'apt-get autoremove' για να τα διαγράψετε."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Χρησιμοποιήστε '%s' για να το διαγράψετε."
+msgstr[1] "Χρησιμοποιήστε '%s' για να τα διαγράψετε."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/es.po b/po/es.po
index c9f671eb64132eb1626754d1984a376fd57500b7..2ccf77317da9d04794e5629b77e54e9630303e62 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -466,10 +466,10 @@ msgstr[1] ""
 "Se instalaron %lu paquetes de forma automática y ya no son necesarios.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Utilice «apt-get autoremove» para eliminarlo."
-msgstr[1] "Utilice «apt-get autoremove» para eliminarlos."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Utilice «%s» para eliminarlo."
+msgstr[1] "Utilice «%s» para eliminarlos."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/eu.po b/po/eu.po
index 4546b15393f7235a9ba2a500cbfc41660cb0b46a..e48e36d01ad6728726f94bbce0feb3358bf58413 100644 (file)
--- a/po/eu.po
+++ b/po/eu.po
@@ -409,10 +409,10 @@ msgstr[1] ""
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "'apt-get autoremove' erabili ezabatzeko."
-msgstr[1] "'apt-get autoremove' erabili ezabatzeko."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "'%s' erabili ezabatzeko."
+msgstr[1] "'%s' erabili ezabatzeko."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/fi.po b/po/fi.po
index 934014b836fd9b79d9882464b42ccc2a06698329..1a7d00881d56f5dd4ea1fb9387811503ebb8adfe 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -410,10 +410,10 @@ msgstr[1] ""
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Poista ne komennolla \"apt-get autoremove\"."
-msgstr[1] "Poista ne komennolla \"apt-get autoremove\"."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Poista ne komennolla \"%s\"."
+msgstr[1] "Poista ne komennolla \"%s\"."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/fr.po b/po/fr.po
index ba777896cb7ad284749f64deeddebed02e66dce4..b931542d683310e4f66f321a31d31b2435a7dd74 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -425,10 +425,10 @@ msgstr[1] ""
 "%lu paquets ont été installés automatiquement et ne sont plus nécessaires.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Veuillez utiliser « apt-get autoremove » pour le supprimer."
-msgstr[1] "Veuillez utiliser « apt-get autoremove » pour les supprimer."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Veuillez utiliser « %s » pour le supprimer."
+msgstr[1] "Veuillez utiliser « %s » pour les supprimer."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/gl.po b/po/gl.po
index dc218225380c7e4d3f013abfb441927bf332419d..02ebe5ba667962eaffe85236559ac93b1df86c33 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -416,10 +416,10 @@ msgstr[1] ""
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Empregue «apt-get autoremove» para eliminalos."
-msgstr[1] "Empregue «apt-get autoremove» para eliminalos."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Empregue «%s» para eliminalos."
+msgstr[1] "Empregue «%s» para eliminalos."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/he.po b/po/he.po
index 2c355f863ec872239d0f0b474b024f02fdac63e5..1e982f8d2970164579948c316868cc44d60dfc07 100644 (file)
--- a/po/he.po
+++ b/po/he.po
@@ -919,7 +919,7 @@ msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:"
 
 #: cmdline/apt-get.cc:1516
-msgid "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove them."
 msgstr ""
 
 #: cmdline/apt-get.cc:1521

diff --git a/po/hu.po b/po/hu.po
index 15bc69ffd82512b2fb2cd9f5716ceca9c05b396a..12052d815fbcdbe649b009db0019fd59dc3ae173 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -407,10 +407,10 @@ msgstr[1] ""
 "%lu csomag automatikusan lett telepítve, és már nincs rájuk szükség.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Ezt az „apt-get autoremove” paranccsal törölheti."
-msgstr[1] "Ezeket az „apt-get autoremove” paranccsal törölheti."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Ezt az „%s” paranccsal törölheti."
+msgstr[1] "Ezeket az „%s” paranccsal törölheti."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/it.po b/po/it.po
index 7d1068e0bf905aed40bf541a79f7b6f38c2a0065..9540ddd14dc976f0e37bc84d877d364ecb27c1ea 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -417,10 +417,10 @@ msgstr[1] ""
 "richiesti.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Usare \"apt-get autoremove\" per rimuoverlo."
-msgstr[1] "Usare \"apt-get autoremove\" per rimuoverli."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Usare \"%s\" per rimuoverlo."
+msgstr[1] "Usare \"%s\" per rimuoverli."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/ja.po b/po/ja.po
index 3056818efc192a23e82b0ae07f565694728534a2..35884b4544da0845c0a9d197b1311173b0ba1065 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -403,9 +403,9 @@ msgstr[0] ""
 "ん:\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "これを削除するには 'apt-get autoremove' を利用してください。"
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "これを削除するには '%s' を利用してください。"
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/km.po b/po/km.po
index 4728c1ecab724fcd7a97d6b093dd1456552beafb..b15cadcdc9024511d73f49e030ec8e9d7efcd131 100644 (file)
--- a/po/km.po
+++ b/po/km.po
@@ -402,8 +402,8 @@ msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹ
 msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

diff --git a/po/ko.po b/po/ko.po
index 79c09f152367fa7abc66359f9f360a0553f60117..8e6cb350839afb4d477c0be47b9e73af21ec50ca 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -399,9 +399,9 @@ msgstr[0] "패키지 %lu개가 자동으로 설치되었지만 더 이상 필요
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "이들을 지우려면 'apt-get autoremove'를 사용하십시오."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "이들을 지우려면 '%s'를 사용하십시오."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/ku.po b/po/ku.po
index 878b82589b23c1f82e251914c501950c5233b4b1..234e9605fc617e9cb9ee752c70dcbf6c252bf9da 100644 (file)
--- a/po/ku.po
+++ b/po/ku.po
@@ -384,8 +384,8 @@ msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:"
 msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

diff --git a/po/lt.po b/po/lt.po
index 553c0839eafe17940438a34f06897fc4393c0153..76503530189bc42cf7f58756cd22268f9250b1fc 100644 (file)
--- a/po/lt.po
+++ b/po/lt.po
@@ -400,10 +400,10 @@ msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikaling
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Norėdami juos pašalinti, paleiskite „apt-get autoremove“"
-msgstr[1] "Norėdami juos pašalinti, paleiskite „apt-get autoremove“"
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Norėdami juos pašalinti, paleiskite „%s“"
+msgstr[1] "Norėdami juos pašalinti, paleiskite „%s“"
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/mr.po b/po/mr.po
index d3e0b26b18b0fbfa1e84b63515d4db14585e722b..ff99d6876d9199739e916a1e00ca2d52dc385d46 100644 (file)
--- a/po/mr.po
+++ b/po/mr.po
@@ -401,10 +401,10 @@ msgstr[1] "खालील नवीन पॅकेजेस स्वयंच
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा."
-msgstr[1] "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "ती काढून टाकण्यासाठी '%s' वापरा."
+msgstr[1] "ती काढून टाकण्यासाठी '%s' वापरा."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/nb.po b/po/nb.po
index 1ea0488d0ab7d9103a1a6ddd302033510ba6a548..91291c3d5662e3fc19ad02b427c42330a130a062 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -410,10 +410,10 @@ msgstr[1] "%lu pakker ble automatisk installert og er ikke lenger påkrevet.\n"
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Bruk «apt-get autoremove» for å fjerne dem."
-msgstr[1] "Bruk «apt-get autoremove» for å fjerne dem."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Bruk «%s» for å fjerne dem."
+msgstr[1] "Bruk «%s» for å fjerne dem."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/ne.po b/po/ne.po
index 4673bff63ccfb5c9ee11af830a30c645eef36d5d..e7c3a7240b833a0a6eb5ebe9c14f1535919daf6a 100644 (file)
--- a/po/ne.po
+++ b/po/ne.po
@@ -398,8 +398,8 @@ msgstr[0] "निम्न नयाँ प्याकेजहरू स्थ
 msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

diff --git a/po/nl.po b/po/nl.po
index b78886df29a3dedc947dcc04dd0e0cd8e1d4a077..e5dccdaf323742518a5024dc513aa8f78a63db93 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -413,10 +413,10 @@ msgstr[1] ""
 "%lu pakketten waren automatisch geïnstalleerd en zijn niet langer nodig.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Gebruik 'apt-get autoremove' om het te verwijderen."
-msgstr[1] "Gebruik 'apt-get autoremove' om ze te verwijderen."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Gebruik '%s' om het te verwijderen."
+msgstr[1] "Gebruik '%s' om ze te verwijderen."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/nn.po b/po/nn.po
index 561a087f21818660e1bffd9aa380972bf6a47db1..b90eca0bc072708879111111acab15c4c535381c 100644 (file)
--- a/po/nn.po
+++ b/po/nn.po
@@ -402,8 +402,8 @@ msgstr[0] "Dei f
 msgstr[1] "Dei følgjande NYE pakkane vil verta installerte:"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

diff --git a/po/pl.po b/po/pl.po
index 02e5d03428655facd81b8911cc20f464a73753de..134873e6f2a669614de9ad8ea7ed8bc575e96529 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -430,11 +430,11 @@ msgstr[2] ""
 "wymagane.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Aby go usunąć należy użyć \"apt-get autoremove\"."
-msgstr[1] "Aby je usunąć należy użyć \"apt-get autoremove\"."
-msgstr[2] "Aby je usunąć należy użyć \"apt-get autoremove\"."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Aby go usunąć należy użyć \"%s\"."
+msgstr[1] "Aby je usunąć należy użyć \"%s\"."
+msgstr[2] "Aby je usunąć należy użyć \"%s\"."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/pt.po b/po/pt.po
index fe9de62708dcce44f6de808368ea48e194f23578..ce61b2b8d733fac28bf13c6303e2c83ae49f823a 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -408,10 +408,10 @@ msgstr[1] ""
 "Os pacotes %lu foram instalados automaticamente e já não são necessários.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Utilize 'apt-get autoremove' para o remover."
-msgstr[1] "Utilize 'apt-get autoremove' para os remover."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Utilize '%s' para o remover."
+msgstr[1] "Utilize '%s' para os remover."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 159bffa5605583523257a89041f539abfd3841c7..d82895db1d46f91715e0e136a0f38049f78e69fa 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -410,10 +410,10 @@ msgstr[1] ""
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Use 'apt-get autoremove' para removê-los."
-msgstr[1] "Use 'apt-get autoremove' para removê-los."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Use '%s' para removê-los."
+msgstr[1] "Use '%s' para removê-los."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/ro.po b/po/ro.po
index 643527ebe7b2bd0110e77019a1a7c1930d01acf9..deaa65ba6adf21b1464624488cf937aceeb8bb50 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -413,11 +413,11 @@ msgstr[2] ""
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Folosiți 'apt-get autoremove' pentru a le șterge."
-msgstr[1] "Folosiți 'apt-get autoremove' pentru a le șterge."
-msgstr[2] "Folosiți 'apt-get autoremove' pentru a le șterge."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Folosiți '%s' pentru a le șterge."
+msgstr[1] "Folosiți '%s' pentru a le șterge."
+msgstr[2] "Folosiți '%s' pentru a le șterge."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/ru.po b/po/ru.po
index 46eadc1c5c15a8ff15a9f56bbe9a4d1a764a1d76..492be269daf7e16ad3500215e3fe039f566fce05 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -425,11 +425,11 @@ msgstr[1] "%lu пакета было установлено автоматиче
 msgstr[2] "%lu пакетов было установлены автоматически и больше не требуются.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Для его удаления используйте «apt-get autoremove»."
-msgstr[1] "Для их удаления используйте «apt-get autoremove»."
-msgstr[2] "Для их удаления используйте «apt-get autoremove»."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Для его удаления используйте «%s»."
+msgstr[1] "Для их удаления используйте «%s»."
+msgstr[2] "Для их удаления используйте «%s»."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/sk.po b/po/sk.po
index 33a5a5ddef30da2df482577190987f0b57ac1973..05f3e11edb9e6116c644378dc4845bf6ca44e775 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -416,11 +416,11 @@ msgstr[2] ""
 "%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Na jeho odstránenie použite „apt-get autoremove“."
-msgstr[1] "Na ich odstránenie použite „apt-get autoremove“."
-msgstr[2] "Na ich odstránenie použite „apt-get autoremove“."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Na jeho odstránenie použite „%s“."
+msgstr[1] "Na ich odstránenie použite „%s“."
+msgstr[2] "Na ich odstránenie použite „%s“."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/sl.po b/po/sl.po
index 1e689e0b15efe6e27c56a37b02e64f44fbd15db8..d6f1c124ecab0c47e40263c3b08f6e705eacda4e 100644 (file)
--- a/po/sl.po
+++ b/po/sl.po
@@ -419,12 +419,12 @@ msgstr[2] "%lu paketa sta bila samodejno nameščena in nista več zahtevana.\n"
 msgstr[3] "%lu paketi so bili samodejno nameščeni in niso več zahtevani.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Uporabite 'apt-get autoremove' za njihovo odstranitev."
-msgstr[1] "Uporabite 'apt-get autoremove' za njegovo odstranitev."
-msgstr[2] "Uporabite 'apt-get autoremove' za njuno odstranitev."
-msgstr[3] "Uporabite 'apt-get autoremove' za njihovo odstranitev."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Uporabite '%s' za njihovo odstranitev."
+msgstr[1] "Uporabite '%s' za njegovo odstranitev."
+msgstr[2] "Uporabite '%s' za njuno odstranitev."
+msgstr[3] "Uporabite '%s' za njihovo odstranitev."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/sv.po b/po/sv.po
index 0bc655387a9cc67dcf1e57e1c15135af4a8334f9..eb044f321d6873de66f66162b45d9bb905344d47 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -414,10 +414,10 @@ msgstr[1] ""
 "%lu paket blev installerade automatiskt och är inte längre nödvändiga.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Använd ”apt-get autoremove” för att ta bort det."
-msgstr[1] "Använd ”apt-get autoremove” för att ta bort dem."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Använd ”%s” för att ta bort det."
+msgstr[1] "Använd ”%s” för att ta bort dem."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/th.po b/po/th.po
index 789b1a04bbe75e84612dc97bfed8becc1c5bb73b..db3b0015e21e3082668d95eab9e8c4b649bd1f03 100644 (file)
--- a/po/th.po
+++ b/po/th.po
@@ -394,9 +394,9 @@ msgid_plural ""
 msgstr[0] "มีแพกเกจ %lu แพกเกจถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "ใช้ 'apt-get autoremove' เพื่อถอดถอนแพกเกจดังกล่าวได้"
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "ใช้ '%s' เพื่อถอดถอนแพกเกจดังกล่าวได้"
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/tl.po b/po/tl.po
index 095643d4c61ccd6f1f5e1db5e8e46eca27463dda..6b29ec31e1cf3719c051951aa4591753f81c392d 100644 (file)
--- a/po/tl.po
+++ b/po/tl.po
@@ -407,8 +407,8 @@ msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 

diff --git a/po/tr.po b/po/tr.po
index e268d92cb321d20b96cdc7064cc2636ad0b91834..13fe20d2f0aaaae32d643d417dcbdf800d598c7a 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -420,10 +420,10 @@ msgstr[0] "%lu paket otomatik olarak kurulmuş ve artık gerekli değil.\n"
 msgstr[1] "%lu paket otomatik olarak kurulmuş ve artık gerekli değil.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Bu paketi kaldırmak için 'apt-get autoremove' komutunu kullanın."
-msgstr[1] "Bu paketleri kaldırmak için 'apt-get autoremove' komutunu kullanın."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Bu paketi kaldırmak için '%s' komutunu kullanın."
+msgstr[1] "Bu paketleri kaldırmak için '%s' komutunu kullanın."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/uk.po b/po/uk.po
index be54efaf9ad7379f44239f1458c87296cfe51dcc..d4697b4dead4daf56acf9cdcc769adc0e2800222 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -423,11 +423,11 @@ msgstr[2] ""
 "%lu пакунків було встановлено автоматично і вони більше не потрібні.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Використовуйте 'apt-get autoremove' щоб видалити його."
-msgstr[1] "Використовуйте 'apt-get autoremove' щоб видалити їх."
-msgstr[2] "Використовуйте 'apt-get autoremove' щоб видалити їх."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Використовуйте '%s' щоб видалити його."
+msgstr[1] "Використовуйте '%s' щоб видалити їх."
+msgstr[2] "Використовуйте '%s' щоб видалити їх."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/vi.po b/po/vi.po
index c2a8c05feffc3158d23046fa0381affa2de64dce..8deacf4d586965561df810eda15145a0808471e2 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -406,9 +406,9 @@ msgid_plural ""
 msgstr[0] "%lu gói đã được tự động cài đặt nên không còn cần yêu cầu lại.\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Hãy dùng lệnh “apt-get autoremove” để gỡ bỏ chúng."
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "Hãy dùng lệnh “%s” để gỡ bỏ chúng."
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 03cf6fef02c497052caa595770f4daeac952e057..648528b09c773e1e048804f61a2531341671f814 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -393,9 +393,9 @@ msgid_plural ""
 msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n"
 
 #: apt-private/private-install.cc
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "使用'apt-get autoremove'来卸载它(它们)。"
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "使用'%s'来卸载它(它们)。"
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/po/zh_TW.po b/po/zh_TW.po
index c50636fa1f7b9fa59fd4619b8930e53c4e2b0c47..86e16c72337b18d80499c9f169cdcdb2bb7688bb 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -399,10 +399,10 @@ msgstr[1] "以下套件是被自動安裝進來的，且已不再會被用到了
 
 #: apt-private/private-install.cc
 #, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "使用 'apt-get autoremove' 來將其移除。"
-msgstr[1] "使用 'apt-get autoremove' 來將其移除。"
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "使用 '%s' 來將其移除。"
+msgstr[1] "使用 '%s' 來將其移除。"
 
 #: apt-private/private-install.cc
 msgid "You might want to run 'apt-get -f install' to correct these:"

diff --git a/test/integration/test-apt-get-autoremove b/test/integration/test-apt-get-autoremove
index 455079cf13bc4879d05cd9739c20d3d5eb460ced..8630815ab6bfc62cda38d64003f5b15007f16eda 100755 (executable)
--- a/test/integration/test-apt-get-autoremove
+++ b/test/integration/test-apt-get-autoremove
@@ -19,6 +19,10 @@ testsuccess aptget remove debhelper -y
 testdpkgnotinstalled 'debhelper'
 testdpkginstalled 'po-debconf' 'unrelated'
 
+AUTOREMOVE='apt autoremove'
+if [ -n "$SUDO_USER" ]; then
+       AUTOREMOVE="sudo $AUTOREMOVE"
+fi
 echo 'APT::NeverAutoRemove { "^debc.*nf$"; };' > rootdir/etc/apt/apt.conf.d/00autoremove
 testsuccessequal 'Reading package lists...
 Building dependency tree...
@@ -32,13 +36,13 @@ Building dependency tree...
 Reading state information...
 The following package was automatically installed and is no longer required:
   po-debconf
-Use 'apt-get autoremove' to remove it.
+Use '$AUTOREMOVE' to remove it.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget install -s
 testequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 1 package was automatically installed and is no longer required.
-Use 'apt-get autoremove' to remove it.
+Use '$AUTOREMOVE' to remove it.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget install -s -o APT::Get::HideAutoRemove=small
 testdpkginstalled 'po-debconf'
 
@@ -81,13 +85,13 @@ Building dependency tree...
 Reading state information...
 The following packages were automatically installed and are no longer required:
   debhelper po-debconf
-Use 'apt-get autoremove' to remove them.
+Use '$AUTOREMOVE' to remove them.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget install -s
 testequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 2 packages were automatically installed and are no longer required.
-Use 'apt-get autoremove' to remove them.
+Use '$AUTOREMOVE' to remove them.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget install -s -o APT::Get::HideAutoRemove=small
 
 testsuccess aptmark hold debhelper

diff --git a/test/integration/test-bug-604222-new-and-autoremove b/test/integration/test-bug-604222-new-and-autoremove
index e910c70cb5f354bcbe0d9acdd2a242eb8f6f0294..da3bde5fda87d66a85bfbbc64f91d580aebfb172 100755 (executable)
--- a/test/integration/test-bug-604222-new-and-autoremove
+++ b/test/integration/test-bug-604222-new-and-autoremove
@@ -11,12 +11,17 @@ touch rootdir/var/lib/apt/extended_states
 testsuccess aptmark markauto 'libvtk5.4'
 testmarkedauto 'libvtk5.4'
 
+AUTOREMOVE='apt autoremove'
+if [ -n "$SUDO_USER" ]; then
+       AUTOREMOVE="sudo $AUTOREMOVE"
+fi
+
 testsuccessequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 The following package was automatically installed and is no longer required:
   libvtk5.4
-Use 'apt-get autoremove' to remove it.
+Use '$AUTOREMOVE' to remove it.
 The following NEW packages will be installed:
   libavcodec52
 0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
@@ -27,7 +32,7 @@ testsuccessequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 1 package was automatically installed and is no longer required.
-Use 'apt-get autoremove' to remove it.
+Use '$AUTOREMOVE' to remove it.
 The following NEW packages will be installed:
   libavcodec52
 0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
@@ -39,7 +44,7 @@ Building dependency tree...
 Reading state information...
 The following package was automatically installed and is no longer required:
   libvtk5.4
-Use 'apt-get autoremove' to remove it.
+Use '$AUTOREMOVE' to remove it.
 The following additional packages will be installed:
   libavcodec52 libopenal-dev libvtk5.4
 The following NEW packages will be installed:
@@ -54,7 +59,7 @@ testequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 1 package was automatically installed and is no longer required.
-Use 'apt-get autoremove' to remove it.
+Use '$AUTOREMOVE' to remove it.
 The following additional packages will be installed:
   libavcodec52 libopenal-dev libvtk5.4
 The following NEW packages will be installed:

diff --git a/test/integration/test-bug-613420-new-garbage-dependency b/test/integration/test-bug-613420-new-garbage-dependency
index 8424b10b756c53d6623c5502899aa55897109cdb..8c6fd1f4223a75310317edc9e6f2a16849271aa6 100755 (executable)
--- a/test/integration/test-bug-613420-new-garbage-dependency
+++ b/test/integration/test-bug-613420-new-garbage-dependency
@@ -11,19 +11,22 @@ insertpackage 'unstable' 'libreoffice-core' 'all' '1:3.3.1~rc1-2' 'Conflicts: op
 insertpackage 'unstable' 'libreoffice-officebean' 'all' '1:3.3.1~rc1-2' 'Depends: libreoffice-core'
 insertpackage 'unstable' 'openoffice.org-officebean' 'all' '1:3.3.0-5' 'Depends: libreoffice-officebean'
 
-
 setupaptarchive
 
 touch rootdir/var/lib/apt/extended_states
 testsuccess aptmark markauto openoffice.org-officebean
 testmarkedauto openoffice.org-officebean
+AUTOREMOVE='apt autoremove'
+if [ -n "$SUDO_USER" ]; then
+       AUTOREMOVE="sudo $AUTOREMOVE"
+fi
 
 testfailureequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 The following packages were automatically installed and are no longer required:
   libreoffice-officebean openoffice.org-officebean
-Use 'apt-get autoremove' to remove them.
+Use '$AUTOREMOVE' to remove them.
 The following additional packages will be installed:
   libreoffice-core libreoffice-officebean openoffice.org-officebean
 The following packages will be REMOVED:
@@ -39,7 +42,7 @@ testequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 2 packages were automatically installed and are no longer required.
-Use 'apt-get autoremove' to remove them.
+Use '$AUTOREMOVE' to remove them.
 The following additional packages will be installed:
   libreoffice-core libreoffice-officebean openoffice.org-officebean
 The following packages will be REMOVED:

diff --git a/test/integration/test-external-dependency-solver-protocol b/test/integration/test-external-dependency-solver-protocol
index a9746d4a2f98467c35e79e6f86e9bb601562e963..e22d0c5e064a8b229d057864459043a227fdccb8 100755 (executable)
--- a/test/integration/test-external-dependency-solver-protocol
+++ b/test/integration/test-external-dependency-solver-protocol
@@ -81,13 +81,17 @@ Remv somestuff [1]
 Remv cool [1]
 Remv stuff [1]' aptget autoremove --solver apt somestuff -s
 
+AUTOREMOVE='apt autoremove'
+if [ -n "$SUDO_USER" ]; then
+       AUTOREMOVE="sudo $AUTOREMOVE"
+fi
 testsuccessequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 Execute external solver...
 The following package was automatically installed and is no longer required:
   stuff
-Use 'apt-get autoremove' to remove it.
+Use '$AUTOREMOVE' to remove it.
 The following packages will be REMOVED:
   cool* somestuff*
 0 upgraded, 0 newly installed, 2 to remove and 0 not upgraded.

diff --git a/test/integration/test-kernel-helper-autoremove b/test/integration/test-kernel-helper-autoremove
index 5e9b9f59adb93dd199ca2cfdee2d813fc65631da..b4e37c46a621d4e08c4d1b20bd2ee12cdb8d9b99 100755 (executable)
--- a/test/integration/test-kernel-helper-autoremove
+++ b/test/integration/test-kernel-helper-autoremove
@@ -53,6 +53,10 @@ testprotected() {
        testfailure --nomsg grep -e '^\^linux-image-amd64\$$' -e '^\^linux-image-686-pae\$$' -e ':i386' protected.list
 }
 
+AUTOREMOVE='apt autoremove'
+if [ -n "$SUDO_USER" ]; then
+       AUTOREMOVE="sudo $AUTOREMOVE"
+fi
 testsuccessequal "Reading package lists...
 Building dependency tree...
 Reading state information...
@@ -63,7 +67,7 @@ The following packages were automatically installed and are no longer required:
    $CURRENTKERNEL (5-1)
    ${CURRENTKERNEL}-686-pae:i386 (5-1)
    ${CURRENTKERNEL}-dbg (5-1)
-Use 'apt-get autoremove' to remove them.
+Use '$AUTOREMOVE' to remove them.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget install -sV
 testsuccessequal "Reading package lists...
 Building dependency tree...
@@ -76,13 +80,13 @@ The following packages were automatically installed and are no longer required:
    ${CURRENTKERNEL}-686-pae:i386 (5-1)
    ${CURRENTKERNEL}-dbg (5-1)
    ${CURRENTKERNEL}-rt (5-1)
-Use 'apt-get autoremove' to remove them.
+Use '$AUTOREMOVE' to remove them.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget install -sV --ignore-hold
 testequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 6 packages were automatically installed and are no longer required.
-Use 'apt-get autoremove' to remove them.
+Use '$AUTOREMOVE' to remove them.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget install -s -o APT::Get::HideAutoRemove=small
 testequal "Reading package lists...
 Building dependency tree...