summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2005-11-05 17:19:36 +0000
committerJason Woodward2005-11-05 17:19:36 +0000
commit4a89946c736f0cda78511e9990daf459313b457f (patch)
treede5c189b0db5203aea7c19b70780307d02dc2889
parent088a90ea6eff75a0f206783a15bf08f7ea139f97 (diff)
downloadslapt-get-4a89946c736f0cda78511e9990daf459313b457f.tar.gz
added --prompt|-p option to always prompt (Kanedaaa)
-rw-r--r--ChangeLog3
-rw-r--r--Makefile2
-rw-r--r--doc/slapt-get.88
-rw-r--r--doc/slapt-get.ru.86
-rw-r--r--doc/slapt-get.uk.86
-rw-r--r--po/cs.po7
-rw-r--r--po/cz.po7
-rw-r--r--po/de.po7
-rw-r--r--po/el.po7
-rw-r--r--po/en.po7
-rw-r--r--po/es.po7
-rw-r--r--po/es_ES.po7
-rw-r--r--po/fr.po7
-rw-r--r--po/it.po7
-rw-r--r--po/nl.po7
-rw-r--r--po/no.po7
-rw-r--r--po/pl.po7
-rw-r--r--po/pt_BR.po7
-rw-r--r--po/pt_PT.po7
-rw-r--r--po/ru.po7
-rw-r--r--po/sk.po7
-rw-r--r--po/sl.po7
-rw-r--r--po/slapt-get.pot7
-rw-r--r--po/sv.po7
-rw-r--r--po/uk.po7
-rw-r--r--po/vi.po7
-rw-r--r--slack-desc2
-rw-r--r--src/configuration.c1
-rw-r--r--src/configuration.h1
-rw-r--r--src/main.c7
-rw-r--r--src/main.h1
-rw-r--r--src/transaction.c8
32 files changed, 143 insertions, 49 deletions
diff --git a/ChangeLog b/ChangeLog
index dcd2309..39e217b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
+0.9.10f Nov 05, 2005
+ * added --prompt|-p option to always prompt (Kanedaaa)
+
0.9.10e Oct 14, 2005
* removed duplicate slapt_add_exclude_to_transaction() calls
* fixed hardcoded mirror setting in PACKAGES.TXT regression
diff --git a/Makefile b/Makefile
index a5029f8..de5a38b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
PACKAGE=slapt-get
-VERSION=0.9.10e
+VERSION=0.9.10f
ARCH=$(shell uname -m | sed -e "s/i[3456]86/i386/")
LIBDIR=/usr/lib
RELEASE=1
diff --git a/doc/slapt-get.8 b/doc/slapt-get.8
index 3ae1252..d0428cb 100644
--- a/doc/slapt-get.8
+++ b/doc/slapt-get.8
@@ -30,6 +30,9 @@ slapt-get \- frontend to pkgtools
.B --no-prompt|-y
]
[
+.B --prompt|-p
+]
+[
.B --reinstall
]
[
@@ -124,7 +127,10 @@ Download the package only. Do not install/upgrade. Packages are downloaded to
Will not install or download packages.
.TP
.B --no-prompt|-y
-Do not prompt for package upgrade confirmation.
+Do not prompt for package upgrade/remove confirmation.
+.TP
+.B --prompt|-p
+Always prompt for package install confirmation.
.TP
.B --reinstall
Install the package even if it is already installed.
diff --git a/doc/slapt-get.ru.8 b/doc/slapt-get.ru.8
index 870b406..e8c1d41 100644
--- a/doc/slapt-get.ru.8
+++ b/doc/slapt-get.ru.8
@@ -30,6 +30,9 @@ slapt-get \- - pkgtools
.B --no-prompt|-y
]
[
+.B --prompt|-p
+]
+[
.B --reinstall
]
[
@@ -128,6 +131,9 @@ slapt-get \- - pkgtools
.B --no-prompt|-y
.
.TP
+.B --prompt|-p
+Always .
+.TP
.B --reinstall
, .
.TP
diff --git a/doc/slapt-get.uk.8 b/doc/slapt-get.uk.8
index f0609bb..646f5b0 100644
--- a/doc/slapt-get.uk.8
+++ b/doc/slapt-get.uk.8
@@ -30,6 +30,9 @@ slapt-get \- - pkgtools
.B --no-prompt|-y
]
[
+.B --prompt|-p
+]
+[
.B --reinstall
]
[
@@ -128,6 +131,9 @@ slapt-get \- - pkgtools
.B --no-prompt|-y
Ц .
.TP
+.B --prompt|-p
+Always Ц .
+.TP
.B --reinstall
, צ צ .
.TP
diff --git a/po/cs.po b/po/cs.po
index 423630d..1c090c3 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10d\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-09-22 12:13+0500\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translator: Oto Petrik <oto.petrik@centrum.cz>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -477,3 +477,6 @@ msgstr "install package, do not attempt to upgrade"
msgid "[disk set(s)] - install specified disk set(s)"
msgstr "[disk set(s)] - install specified disk set(s)"
+msgid "always prompt during install/upgrade"
+msgstr "always prompt during install/upgrade"
+
diff --git a/po/cz.po b/po/cz.po
index 3edfe89..cc6b127 100644
--- a/po/cz.po
+++ b/po/cz.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.9d\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2004-09-06 21:17+0500\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translator: Oto Petrik <oto.petrik@centrum.cz>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -486,3 +486,6 @@ msgstr "Maximln dlka vylouench (%d) pekroena.\n"
msgid "only purge cache of older, unreacheable pkgs"
msgstr "vyisti pouze cache starch, nedostupnch balk"
+msgid "always prompt during install/upgrade"
+msgstr "always prompt during install/upgrade"
+
diff --git a/po/de.po b/po/de.po
index 38b134e..814c026 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10d\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-09-22 12:13+0500\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translator: Niklas Volbers <mithrandir42@web.de>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -477,3 +477,6 @@ msgstr "install package, do not attempt to upgrade"
msgid "[disk set(s)] - install specified disk set(s)"
msgstr "[disk set(s)] - install specified disk set(s)"
+msgid "always prompt during install/upgrade"
+msgstr "always prompt during install/upgrade"
+
diff --git a/po/el.po b/po/el.po
index d17b68f..0c978ad 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,9 +5,9 @@
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10d\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-09-22 12:13+0500\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translator: Savvas Eftratiadis <pigouinos@mailworks.org.\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -476,3 +476,6 @@ msgstr "install package, do not attempt to upgrade"
msgid "[disk set(s)] - install specified disk set(s)"
msgstr "[disk set(s)] - install specified disk set(s)"
+msgid "always prompt during install/upgrade"
+msgstr "always prompt during install/upgrade"
+
diff --git a/po/en.po b/po/en.po
index c0d6d06..1e0c652 100644
--- a/po/en.po
+++ b/po/en.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10d\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-09-22 12:13+0500\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translator: Jason Woodward <woodwardj@jaos.org>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -477,3 +477,6 @@ msgstr "install package, do not attempt to upgrade"
msgid "[disk set(s)] - install specified disk set(s)"
msgstr "[disk set(s)] - install specified disk set(s)"
+msgid "always prompt during install/upgrade"
+msgstr "always prompt during install/upgrade"
+
diff --git a/po/es.po b/po/es.po
index b5a11f1..c04f358 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10d\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-09-22 12:13+0500\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translator: Ruben Gutierrez <ruben@snpp.com.ar>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -477,3 +477,6 @@ msgstr "install package, do not attempt to upgrade"
msgid "[disk set(s)] - install specified disk set(s)"
msgstr "[disk set(s)] - install specified disk set(s)"
+msgid "always prompt during install/upgrade"
+msgstr "always prompt during install/upgrade"
+
diff --git a/po/es_ES.po b/po/es_ES.po
index 300e45b..b68468e 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10d\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-09-22 12:13+0500\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translator: Ruben Gutierrez <ruben@snpp.com.ar>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -477,3 +477,6 @@ msgstr "install package, do not attempt to upgrade"
msgid "[disk set(s)] - install specified disk set(s)"
msgstr "[disk set(s)] - install specified disk set(s)"
+msgid "always prompt during install/upgrade"
+msgstr "always prompt during install/upgrade"
+
diff --git a/po/fr.po b/po/fr.po
index 7b3fdda..bb634ca 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10d\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-09-22 12:13+0500\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translators: Verachten Bruno <gounthar@gmail.com>, solsTiCe d'Hiver <solstice.dhiver@laposte.net>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -477,3 +477,6 @@ msgstr "install package, do not attempt to upgrade"
msgid "[disk set(s)] - install specified disk set(s)"
msgstr "[disk set(s)] - install specified disk set(s)"
+msgid "always prompt during install/upgrade"
+msgstr "always prompt during install/upgrade"
+
diff --git a/po/it.po b/po/it.po
index 079e84b..5e193c4 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,9 +6,9 @@
#,fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10d\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-09-22 12:13+0500\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translator: Francesco Gigli <jaramir@slack.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"MIME-Version: 1.0\n"
@@ -477,3 +477,6 @@ msgstr "install package, do not attempt to upgrade"
msgid "[disk set(s)] - install specified disk set(s)"
msgstr "[disk set(s)] - install specified disk set(s)"
+msgid "always prompt during install/upgrade"
+msgstr "always prompt during install/upgrade"
+
diff --git a/po/nl.po b/po/nl.po
index f5f01a3..081e98d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10d\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-09-22 12:13+0500\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translator: Stefan Koopmanschap <stefan@electronicmusicworld.com>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -477,3 +477,6 @@ msgstr "install package, do not attempt to upgrade"
msgid "[disk set(s)] - install specified disk set(s)"
msgstr "[disk set(s)] - install specified disk set(s)"
+msgid "always prompt during install/upgrade"
+msgstr "always prompt during install/upgrade"
+
diff --git a/po/no.po b/po/no.po
index c17d8d0..1484cb3 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10d\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-09-22 12:13+0500\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translator: Joran Kvalvaag <jk@nerdworks.org>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -477,3 +477,6 @@ msgstr "install package, do not attempt to upgrade"
msgid "[disk set(s)] - install specified disk set(s)"
msgstr "[disk set(s)] - install specified disk set(s)"
+msgid "always prompt during install/upgrade"
+msgstr "always prompt during install/upgrade"
+
diff --git a/po/pl.po b/po/pl.po
index da8d12d..7f1792a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10d\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-09-22 12:13+0500\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translators: Sajmon <sajmon@tenboard.com>, Paul Blazejowski <paulb@blazebox.homeip.net>, nixon <nixon@klub.chip.pl> and simon <ssiimm@poczta.onet.pl>\n"
"Language-Team: polish slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -477,3 +477,6 @@ msgstr "zainstaluj pakiet, nie prbuj go aktualizowa"
msgid "[disk set(s)] - install specified disk set(s)"
msgstr "[disk set(s)] - install specified disk set(s)"
+msgid "always prompt during install/upgrade"
+msgstr "always prompt during install/upgrade"
+
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 09c7dd4..f0c6bfe 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10d\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-09-22 12:13+0500\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translator: Henrique Pinto <henrique.pinto@kdemail.net>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -476,3 +476,6 @@ msgstr "install package, do not attempt to upgrade"
msgid "[disk set(s)] - install specified disk set(s)"
msgstr "[disk set(s)] - install specified disk set(s)"
+msgid "always prompt during install/upgrade"
+msgstr "always prompt during install/upgrade"
+
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 3b11cbb..1ca4bd6 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10e\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-10-02 22:43+0400\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translator: Miguel Santinho <msantinho@simplicidade.com>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -476,3 +476,6 @@ msgstr "instale o pacote, no tente actualiz-lo"
msgid "[disk set(s)] - install specified disk set(s)"
msgstr "[disk set(s)] - instalar 'disk set(s)' especificados"
+msgid "always prompt during install/upgrade"
+msgstr "always prompt during install/upgrade"
+
diff --git a/po/ru.po b/po/ru.po
index 44ab8b1..014892c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10d\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2005-09-07 23:24 EEST\n"
-"PO-Revision-Date: 2005-09-22 12:13+0500\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translators: sin <digitalhunger@gmail.com>\n"
"Language-Team: DeepStyle Team <hottab@deepstyle.org.ua>\n"
"MIME-Version: 1.0\n"
@@ -477,3 +477,6 @@ msgstr " , "
msgid "[disk set(s)] - install specified disk set(s)"
msgstr "[disk set(s)] - install specified disk set(s)"
+msgid "always prompt during install/upgrade"
+msgstr "always prompt during install/upgrade"
+
diff --git a/po/sk.po b/po/sk.po
index cbab970..bea77b1 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10d\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2005-06-23 21:28+0500\n"
-"PO-Revision-Date: 2005-09-22 12:13+0500\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translator: Erik Gyepes <depi@depi.sk>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -477,3 +477,6 @@ msgstr "install package, do not attempt to upgrade"
msgid "[disk set(s)] - install specified disk set(s)"
msgstr "[disk set(s)] - install specified disk set(s)"
+msgid "always prompt during install/upgrade"
+msgstr "always prompt during install/upgrade"
+
diff --git a/po/sl.po b/po/sl.po
index 8744f09..c8ad6fd 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10d\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2005-03-09\n"
-"PO-Revision-Date: 2005-09-22 12:13+0500\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translator: Uros Trsavec <utrsav@walla.com>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -477,3 +477,6 @@ msgstr "install package, do not attempt to upgrade"
msgid "[disk set(s)] - install specified disk set(s)"
msgstr "[disk set(s)] - install specified disk set(s)"
+msgid "always prompt during install/upgrade"
+msgstr "always prompt during install/upgrade"
+
diff --git a/po/slapt-get.pot b/po/slapt-get.pot
index f0fb131..bea82ea 100644
--- a/po/slapt-get.pot
+++ b/po/slapt-get.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10d\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-09-22 12:13+0500\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translator: Jason Woodward <woodwardj@jaos.org>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -477,3 +477,6 @@ msgstr ""
msgid "[disk set(s)] - install specified disk set(s)"
msgstr ""
+msgid "always prompt during install/upgrade"
+msgstr ""
+
diff --git a/po/sv.po b/po/sv.po
index f4bc477..5f28b19 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10d\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-09-22 12:13+0500\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translator: Joel Bjurman <ypolt@lediga.st>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -477,3 +477,6 @@ msgstr "install package, do not attempt to upgrade"
msgid "[disk set(s)] - install specified disk set(s)"
msgstr "[disk set(s)] - install specified disk set(s)"
+msgid "always prompt during install/upgrade"
+msgstr "always prompt during install/upgrade"
+
diff --git a/po/uk.po b/po/uk.po
index 3db538d..859ce53 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10d\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2005-09-07 23:24 EEST\n"
-"PO-Revision-Date: 2005-09-22 12:13+0500\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translators: sin <digitalhunger@gmail.com>\n"
"Language-Team: DeepStyle Team <hottab@deepstyle.org.ua>\n"
"MIME-Version: 1.0\n"
@@ -477,3 +477,6 @@ msgstr " , "
msgid "[disk set(s)] - install specified disk set(s)"
msgstr "[disk set(s)] - install specified disk set(s)"
+msgid "always prompt during install/upgrade"
+msgstr "always prompt during install/upgrade"
+
diff --git a/po/vi.po b/po/vi.po
index 873cbec..99f0da4 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.10d\n"
+"Project-Id-Version: 0.9.10f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2005-09-22 12:13+0500\n"
+"PO-Revision-Date: 2005-11-05 12:24+0500\n"
"Last-Translator: Nguyễn Văn Vũ <vncasper@yahoo.com>\n"
"Language-Team: gnome-vi <gnomevi-list@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -478,3 +478,6 @@ msgstr "cài đặt mới, không nâng cấp"
msgid "[disk set(s)] - install specified disk set(s)"
msgstr "[disk set(s)] - install specified disk set(s)"
+msgid "always prompt during install/upgrade"
+msgstr "always prompt during install/upgrade"
+
diff --git a/slack-desc b/slack-desc
index 720e034..182a5d5 100644
--- a/slack-desc
+++ b/slack-desc
@@ -9,7 +9,7 @@
slapt-get: slapt-get (APT like system for Slackware)
slapt-get: slapt-get is an APT like system for Slackware package management.
slapt-get:
-slapt-get: * See /usr/doc/slapt-get-0.9.10e/ for complete documentation.
+slapt-get: * See /usr/doc/slapt-get-0.9.10f/ for complete documentation.
slapt-get: * You will also want to customize /etc/slapt-get/slapt-getrc,
slapt-get: using a local mirror. www.slackware.com may be very busy.
slapt-get: * Support:
diff --git a/src/configuration.c b/src/configuration.c
index 0265842..43c4ea6 100644
--- a/src/configuration.c
+++ b/src/configuration.c
@@ -41,6 +41,7 @@ slapt_rc_config *slapt_read_rc_config(const char *file_name)
global_config->print_uris = SLAPT_FALSE;
global_config->dl_stats = SLAPT_FALSE;
global_config->no_prompt = SLAPT_FALSE;
+ global_config->prompt = SLAPT_FALSE;
global_config->re_install = SLAPT_FALSE;
global_config->exclude_list = NULL;
global_config->working_dir[0] = '\0';
diff --git a/src/configuration.h b/src/configuration.h
index 6a4a19d..2ed0971 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -23,6 +23,7 @@ typedef struct {
SLAPT_BOOL_T dist_upgrade;
SLAPT_BOOL_T simulate;
SLAPT_BOOL_T no_prompt;
+ SLAPT_BOOL_T prompt;
SLAPT_BOOL_T re_install;
SLAPT_BOOL_T ignore_excludes;
SLAPT_BOOL_T no_md5_check;
diff --git a/src/main.c b/src/main.c
index 6ad0730..9a33e76 100644
--- a/src/main.c
+++ b/src/main.c
@@ -46,6 +46,8 @@ int main( int argc, char *argv[] )
{"version", 0, 0, SLAPT_VERSION_OPT},
{"no-prompt", 0, 0, SLAPT_NO_PROMPT_OPT},
{"y", 0, 0, SLAPT_NO_PROMPT_OPT},
+ {"prompt", 0, 0, SLAPT_PROMPT_OPT},
+ {"p", 0, 0, SLAPT_PROMPT_OPT},
{"reinstall", 0, 0, SLAPT_REINSTALL_OPT},
{"ignore-excludes", 0, 0, SLAPT_IGNORE_EXCLUDES_OPT},
{"no-md5", 0, 0, SLAPT_NO_MD5_OPT},
@@ -129,6 +131,9 @@ int main( int argc, char *argv[] )
case SLAPT_NO_PROMPT_OPT: /* auto */
global_config->no_prompt = SLAPT_TRUE;
break;
+ case SLAPT_PROMPT_OPT: /* always prompt */
+ global_config->prompt = SLAPT_TRUE;
+ break;
case SLAPT_REINSTALL_OPT: /* reinstall */
global_config->re_install = SLAPT_TRUE;
break;
@@ -173,6 +178,7 @@ int main( int argc, char *argv[] )
global_config->dist_upgrade = tmp_gc->dist_upgrade;
global_config->simulate = tmp_gc->simulate;
global_config->no_prompt = tmp_gc->no_prompt;
+ global_config->prompt = tmp_gc->prompt;
global_config->re_install = tmp_gc->re_install;
global_config->ignore_excludes = tmp_gc->ignore_excludes;
global_config->no_md5_check = tmp_gc->no_md5_check;
@@ -367,6 +373,7 @@ void usage(void)
printf(" --download-only - %s\n",gettext("only download pkg on install/upgrade"));
printf(" --simulate|-s - %s\n",gettext("show pkgs to be installed/upgraded"));
printf(" --no-prompt|-y - %s\n",gettext("do not prompt during install/upgrade"));
+ printf(" --prompt|-p - %s\n",gettext("always prompt during install/upgrade"));
printf(" --reinstall - %s\n",gettext("re-install the pkg"));
printf(" --ignore-excludes - %s\n",gettext("install/upgrade excludes"));
printf(" --no-md5 - %s\n",gettext("do not perform md5 check sum"));
diff --git a/src/main.h b/src/main.h
index 91884c3..600cc8f 100644
--- a/src/main.h
+++ b/src/main.h
@@ -67,6 +67,7 @@ enum slapt_action {
#define SLAPT_SIMULATE_OPT 'm'
#define SLAPT_VERSION_OPT 'v'
#define SLAPT_NO_PROMPT_OPT 'b'
+#define SLAPT_PROMPT_OPT 'y'
#define SLAPT_REINSTALL_OPT 'n'
#define SLAPT_IGNORE_EXCLUDES_OPT 'x'
#define SLAPT_NO_MD5_OPT '5'
diff --git a/src/transaction.c b/src/transaction.c
index 8cf33ec..8e10597 100644
--- a/src/transaction.c
+++ b/src/transaction.c
@@ -279,15 +279,15 @@ int slapt_handle_transaction (const slapt_rc_config *global_config,
}
/* prompt */
- if (
- (tran->upgrade_pkgs->pkg_count > 0 || tran->remove_pkgs->pkg_count > 0 ||
+ if ((global_config->prompt == SLAPT_TRUE) ||
+ ((tran->upgrade_pkgs->pkg_count > 0 || tran->remove_pkgs->pkg_count > 0 ||
(tran->install_pkgs->pkg_count > 0 &&
global_config->dist_upgrade == SLAPT_TRUE)) &&
(global_config->no_prompt == SLAPT_FALSE &&
global_config->download_only == SLAPT_FALSE &&
global_config->simulate == SLAPT_FALSE &&
- global_config->print_uris == SLAPT_FALSE)
- ) {
+ global_config->print_uris == SLAPT_FALSE))
+ ) {
if (slapt_ask_yes_no(gettext("Do you want to continue? [y/N] ")) != 1) {
printf(gettext("Abort.\n"));
return 1;