diff -u aptitude-0.2.14.1/src/ui.cc aptitude-0.2.14.1/src/ui.cc --- aptitude-0.2.14.1/src/ui.cc +++ aptitude-0.2.14.1/src/ui.cc @@ -285,13 +285,9 @@ // since the user has to authenticate themselves as root (ie, if // they're going to do something evil that way they'd have su'd // directly) - char cmdbuf[512]; - snprintf(cmdbuf, 512, "%s -S %s %s", - argv0, statusfile.c_str(), args.c_str()); - - // I think I shall assume that su is in a sane place and behaves + // I think I shall assume that sudo is in a sane place and behaves // sanely. - execl("/bin/su", "/bin/su", "-c", cmdbuf, NULL); + execl("/usr/bin/sudo", "/usr/bin/sudo", argv0, "-S", statusfile.c_str(), args.c_str(), NULL); } else { @@ -1087,7 +1083,7 @@ N_("Waste time trying to find mines"), SigC::slot(do_sweep)), vs_menu_info(vs_menu_info::VS_MENU_ITEM, N_("^Become root"), NULL, - N_("Run 'su' to become root. This will restart the program, but your\nsettings will be preserved."), bind(SigC::slot(do_su_to_root), "")), + N_("Run 'sudo' to become root. This will restart the program, but your\nsettings will be preserved."), bind(SigC::slot(do_su_to_root), "")), #ifdef WITH_RELOAD_CACHE vs_menu_info(vs_menu_info::VS_MENU_ITEM, N_("^Reload package cache"), NULL, diff -u aptitude-0.2.14.1/debian/changelog aptitude-0.2.14.1/debian/changelog --- aptitude-0.2.14.1/debian/changelog +++ aptitude-0.2.14.1/debian/changelog @@ -1,3 +1,11 @@ +aptitude (0.2.14.1-2ubuntu2) warty; urgency=low + + * src/ui.cc: use sudo, not su for changing to root mode (Warty bug #1589) + * src/ui.cc, po/*.po: changed "Become root" help to mention sudo instead of + su. + + -- Martin Pitt Wed, 22 Sep 2004 12:22:01 +0200 + aptitude (0.2.14.1-2ubuntu1) warty; urgency=low * Fix 64-bit long issues. Closes: #243932 only in patch2: unchanged: --- aptitude-0.2.14.1.orig/po/zh_CN.po +++ aptitude-0.2.14.1/po/zh_CN.po @@ -3338,7 +3338,7 @@ #: src/ui.cc:1090 msgid "" -"Run 'su' to become root. This will restart the program, but your\n" +"Run 'sudo' to become root. This will restart the program, but your\n" "settings will be preserved." msgstr "" "运行“su”成为 root。这将重新启动程序，但是您的\n" only in patch2: unchanged: --- aptitude-0.2.14.1.orig/po/da.po +++ aptitude-0.2.14.1/po/da.po @@ -3465,10 +3465,10 @@ #: src/ui.cc:1090 msgid "" -"Run 'su' to become root. This will restart the program, but your\n" +"Run 'sudo' to become root. This will restart the program, but your\n" "settings will be preserved." msgstr "" -"Kr 'su' for at blive root. Dette vil genstarte programmet, men dine\n" +"Kr 'sudo' for at blive root. Dette vil genstarte programmet, men dine\n" "indstillinger vil blive bevaret." #: src/ui.cc:1093 only in patch2: unchanged: --- aptitude-0.2.14.1.orig/po/de.po +++ aptitude-0.2.14.1/po/de.po @@ -3563,10 +3563,10 @@ #: src/ui.cc:1090 msgid "" -"Run 'su' to become root. This will restart the program, but your\n" +"Run 'sudo' to become root. This will restart the program, but your\n" "settings will be preserved." msgstr "" -"'su' ausführen um root zu werden. Dies wird das Programm neu starten, aber\n" +"'sudo' ausführen um root zu werden. Dies wird das Programm neu starten, aber\n" "Ihre Einstellungen werden erhalten bleiben." #: src/ui.cc:1093 only in patch2: unchanged: --- aptitude-0.2.14.1.orig/po/cs.po +++ aptitude-0.2.14.1/po/cs.po @@ -3438,10 +3438,10 @@ #: src/ui.cc:1090 msgid "" -"Run 'su' to become root. This will restart the program, but your\n" +"Run 'sudo' to become root. This will restart the program, but your\n" "settings will be preserved." msgstr "" -"Pro pepnut na uivatele root pouije 'su', m se program restartuje,\n" +"Pro pepnut na uivatele root pouije 'sudo', m se program restartuje,\n" "ale nastaven budou zachovna." #: src/ui.cc:1093 only in patch2: unchanged: --- aptitude-0.2.14.1.orig/po/el.po +++ aptitude-0.2.14.1/po/el.po @@ -3303,10 +3303,10 @@ #: src/ui.cc:1090 msgid "" -"Run 'su' to become root. This will restart the program, but your\n" +"Run 'sudo' to become root. This will restart the program, but your\n" "settings will be preserved." msgstr "" -"Εκτελεί την εντολή 'su' για σύνδεση ως root. Αυτή θα ξαναεκτελέσει το " +"Εκτελεί την εντολή 'sudo' για σύνδεση ως root. Αυτή θα ξαναεκτελέσει το " "πρόγραμμα αλλά με τις δικές σας ρυθμίσεις." #: src/ui.cc:1093 only in patch2: unchanged: --- aptitude-0.2.14.1.orig/po/es.po +++ aptitude-0.2.14.1/po/es.po @@ -3553,10 +3553,10 @@ #: src/ui.cc:1090 msgid "" -"Run 'su' to become root. This will restart the program, but your\n" +"Run 'sudo' to become root. This will restart the program, but your\n" "settings will be preserved." msgstr "" -"Ejecuta 'su' para convertirse en administrador. Esto reiniciar el programa " +"Ejecuta 'sudo' para convertirse en administrador. Esto reiniciar el programa " "pero se mantendrn sus preferencias." #: src/ui.cc:1093 only in patch2: unchanged: --- aptitude-0.2.14.1.orig/po/fi.po +++ aptitude-0.2.14.1/po/fi.po @@ -3451,10 +3451,10 @@ #: src/ui.cc:1090 msgid "" -"Run 'su' to become root. This will restart the program, but your\n" +"Run 'sudo' to become root. This will restart the program, but your\n" "settings will be preserved." msgstr "" -"Vaihda root-tunnukselle komennolla 'su'. Tm kynnist ohjelman\n" +"Vaihda root-tunnukselle komennolla 'sudo'. Tm kynnist ohjelman\n" "uudelleen, mutta asetuksesi silyvt nykyiselln." #: src/ui.cc:1093 only in patch2: unchanged: --- aptitude-0.2.14.1.orig/po/fr.po +++ aptitude-0.2.14.1/po/fr.po @@ -3629,7 +3629,7 @@ #: src/ui.cc:1090 msgid "" -"Run 'su' to become root. This will restart the program, but your\n" +"Run 'sudo' to become root. This will restart the program, but your\n" "settings will be preserved." msgstr "" "Utiliser la commande su pour devenir administrateur.\n" only in patch2: unchanged: --- aptitude-0.2.14.1.orig/po/gl.po +++ aptitude-0.2.14.1/po/gl.po @@ -3127,7 +3127,7 @@ #: src/ui.cc:1090 msgid "" -"Run 'su' to become root. This will restart the program, but your\n" +"Run 'sudo' to become root. This will restart the program, but your\n" "settings will be preserved." msgstr "" only in patch2: unchanged: --- aptitude-0.2.14.1.orig/po/ja.po +++ aptitude-0.2.14.1/po/ja.po @@ -3462,7 +3462,7 @@ #: src/ui.cc:1090 msgid "" -"Run 'su' to become root. This will restart the program, but your\n" +"Run 'sudo' to become root. This will restart the program, but your\n" "settings will be preserved." msgstr "" "su¹ԤrootˤʤꡢץƵưޤ \n" only in patch2: unchanged: --- aptitude-0.2.14.1.orig/po/it.po +++ aptitude-0.2.14.1/po/it.po @@ -3585,7 +3585,7 @@ #: src/ui.cc:1090 msgid "" -"Run 'su' to become root. This will restart the program, but your\n" +"Run 'sudo' to become root. This will restart the program, but your\n" "settings will be preserved." msgstr "" "Esegue «su» per diventare root: questo farà ripartire il programma,\n" only in patch2: unchanged: --- aptitude-0.2.14.1.orig/po/lt.po +++ aptitude-0.2.14.1/po/lt.po @@ -3462,7 +3462,7 @@ #: src/ui.cc:1090 msgid "" -"Run 'su' to become root. This will restart the program, but your\n" +"Run 'sudo' to become root. This will restart the program, but your\n" "settings will be preserved." msgstr "" "Paleiskite komand su, kad taptumte root. Programa startuos\n" only in patch2: unchanged: --- aptitude-0.2.14.1.orig/po/nn.po +++ aptitude-0.2.14.1/po/nn.po @@ -3486,7 +3486,7 @@ #: src/ui.cc:1090 msgid "" -"Run 'su' to become root. This will restart the program, but your\n" +"Run 'sudo' to become root. This will restart the program, but your\n" "settings will be preserved." msgstr "" "Køyrer «su» for å bli root. Dette vil starta programmet på ny, men\n" only in patch2: unchanged: --- aptitude-0.2.14.1.orig/po/pl.po +++ aptitude-0.2.14.1/po/pl.po @@ -3382,7 +3382,7 @@ #: src/ui.cc:1090 msgid "" -"Run 'su' to become root. This will restart the program, but your\n" +"Run 'sudo' to become root. This will restart the program, but your\n" "settings will be preserved." msgstr "" "Uyj \"su\" do uzyskania uprawnie administratora.\n" only in patch2: unchanged: --- aptitude-0.2.14.1.orig/po/pt.po +++ aptitude-0.2.14.1/po/pt.po @@ -3534,10 +3534,10 @@ #: src/ui.cc:1090 msgid "" -"Run 'su' to become root. This will restart the program, but your\n" +"Run 'sudo' to become root. This will restart the program, but your\n" "settings will be preserved." msgstr "" -"Executar 'su' para tornar-se root. Esta operação irá reiniciar o programa, " +"Executar 'sudo' para tornar-se root. Esta operação irá reiniciar o programa, " "mas\n" "as suas configurações serão guardadas." only in patch2: unchanged: --- aptitude-0.2.14.1.orig/po/aptitude.pot +++ aptitude-0.2.14.1/po/aptitude.pot @@ -3061,7 +3061,7 @@ #: src/ui.cc:1090 msgid "" -"Run 'su' to become root. This will restart the program, but your\n" +"Run 'sudo' to become root. This will restart the program, but your\n" "settings will be preserved." msgstr "" only in patch2: unchanged: --- aptitude-0.2.14.1.orig/po/pt_BR.po +++ aptitude-0.2.14.1/po/pt_BR.po @@ -3520,10 +3520,10 @@ #: src/ui.cc:1090 msgid "" -"Run 'su' to become root. This will restart the program, but your\n" +"Run 'sudo' to become root. This will restart the program, but your\n" "settings will be preserved." msgstr "" -"Executar 'su' para tornar-se root. Isto ir reiniciar o programa, mas\n" +"Executar 'sudo' para tornar-se root. Isto ir reiniciar o programa, mas\n" " suas configuraes sero preservadas." #: src/ui.cc:1093