aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2004-12-17 16:13:12 +0000
committerJason Woodward2004-12-17 16:13:12 +0000
commit72983c12852470cd2f7f6ad96961876de0896781 (patch)
tree5f70bdecfa644bf7f644a79f2f48f10054553154
parentb7fac38d22f60d67124573ce8f7e06fa8b0f7c4e (diff)
downloadslapt-get-72983c12852470cd2f7f6ad96961876de0896781.tar.gz
produce warning is slack-require information is too long
-rw-r--r--ChangeLog3
-rw-r--r--po/cs.po8
-rw-r--r--po/de.po8
-rw-r--r--po/el.po9
-rw-r--r--po/en.po8
-rw-r--r--po/es.po8
-rw-r--r--po/es_ES.po8
-rw-r--r--po/fr.po8
-rw-r--r--po/it.po8
-rw-r--r--po/nl.po8
-rw-r--r--po/no.po8
-rw-r--r--po/pl.po8
-rw-r--r--po/pt_BR.po8
-rw-r--r--po/pt_PT.po8
-rw-r--r--po/slapt-get.pot8
-rw-r--r--po/sv.po8
-rw-r--r--src/package.c11
17 files changed, 104 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index 86fa459..5ef5ba4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
-0.9.9f Dec 10, 2004
+0.9.9f Dec 17, 2004
+ * produce warning is slack-require information is too long
* updated setlocale() call to set category to LC_ALL, thanks Piotr Simon
* updated documentation
diff --git a/po/cs.po b/po/cs.po
index 87056ed..8659b84 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.9d\n"
+"Project-Id-Version: 0.9.9f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2004-09-06 21:17+0500\n"
+"PO-Revision-Date: 2004-12-17 10:56+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,7 @@ msgstr "Maximln dlka vylouench (%d) pekroena.\n"
msgid "only purge cache of older, unreacheable pkgs"
msgstr "vyisti pouze cache starch, nedostupnch balk"
+#, c-format
+msgid "required too long [%s:%d]\n"
+msgstr "required pli dlouh [%s:%d]\n"
+
diff --git a/po/de.po b/po/de.po
index 2d5ce0a..109daca 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.9d\n"
+"Project-Id-Version: 0.9.9f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2004-10-03 18:07+0400\n"
+"PO-Revision-Date: 2004-12-17 10:56+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"
@@ -486,3 +486,7 @@ msgstr "Maximale Lnge der auszuschlieenden Pakete (%d) berschritten.\n"
msgid "only purge cache of older, unreacheable pkgs"
msgstr "nur alte, nicht mehr verfgbare Pakete aus Zwischenspeicher entfernen"
+#, c-format
+msgid "required too long [%s:%d]\n"
+msgstr "required zu lang [ %s:%d]\n"
+
diff --git a/po/el.po b/po/el.po
index 232a520..173b548 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,9 +5,9 @@
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.9c\n"
+"Project-Id-Version: 0.9.9f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2004-10-05 17:42+0400\n"
+"PO-Revision-Date: 2004-12-17 10:56+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"
@@ -479,3 +479,8 @@ msgstr " (%d) .\n"
msgid "Maximum length of excludes (%d) exceeded.\n"
msgstr " (%d) .\n"
+
+#, c-format
+msgid "required too long [%s:%d]\n"
+msgstr ""
+
diff --git a/po/en.po b/po/en.po
index cda14bc..c25884d 100644
--- a/po/en.po
+++ b/po/en.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.9c\n"
+"Project-Id-Version: 0.9.9f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2004-10-03 18:07+0400\n"
+"PO-Revision-Date: 2004-12-17 10:56+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"
@@ -484,3 +484,7 @@ msgstr "Maximum length of excludes (%d) exceeded.\n"
msgid "only purge cache of older, unreacheable pkgs"
msgstr "only purge cache of older, unreacheable pkgs"
+#, c-format
+msgid "required too long [%s:%d]\n"
+msgstr "required too long [%s:%d]\n"
+
diff --git a/po/es.po b/po/es.po
index c0bdf59..0d98e79 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.9c\n"
+"Project-Id-Version: 0.9.9f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2004-10-03 18:07+0400\n"
+"PO-Revision-Date: 2004-12-17 10:56+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"
@@ -484,3 +484,7 @@ msgstr ""
msgid "only purge cache of older, unreacheable pkgs"
msgstr ""
+#, c-format
+msgid "required too long [%s:%d]\n"
+msgstr "requerido demasiado largo [%s:%d]\n"
+
diff --git a/po/es_ES.po b/po/es_ES.po
index dd86f38..6111baa 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.9c\n"
+"Project-Id-Version: 0.9.9f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2004-10-03 18:07+0400\n"
+"PO-Revision-Date: 2004-12-17 10:56+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"
@@ -484,3 +484,7 @@ msgstr ""
msgid "only purge cache of older, unreacheable pkgs"
msgstr ""
+#, c-format
+msgid "required too long [%s:%d]\n"
+msgstr "requerido demasiado largo [%s:%d]\n"
+
diff --git a/po/fr.po b/po/fr.po
index d92aa44..b189f61 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.9c\n"
+"Project-Id-Version: 0.9.9f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2004-10-03 18:07+0400\n"
+"PO-Revision-Date: 2004-12-17 10:56+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"
@@ -486,3 +486,7 @@ msgstr ""
msgid "only purge cache of older, unreacheable pkgs"
msgstr ""
+#, c-format
+msgid "required too long [%s:%d]\n"
+msgstr ""
+
diff --git a/po/it.po b/po/it.po
index 922bd0c..3b710df 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,9 +6,9 @@
#,fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.9c\n"
+"Project-Id-Version: 0.9.9f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2004-10-03 18:07+0400\n"
+"PO-Revision-Date: 2004-12-17 10:56+0500\n"
"Last-Translator: Francesco Gigli <jaramir@slack.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"MIME-Version: 1.0\n"
@@ -484,3 +484,7 @@ msgstr ""
msgid "only purge cache of older, unreacheable pkgs"
msgstr ""
+#, c-format
+msgid "required too long [%s:%d]\n"
+msgstr "richiesto troppo lungo [%s:%d]\n"
+
diff --git a/po/nl.po b/po/nl.po
index b0b55a6..7fda80a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.9c\n"
+"Project-Id-Version: 0.9.9f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2004-10-03 18:07+0400\n"
+"PO-Revision-Date: 2004-12-17 10:56+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"
@@ -484,3 +484,7 @@ msgstr ""
msgid "only purge cache of older, unreacheable pkgs"
msgstr ""
+#, c-format
+msgid "required too long [%s:%d]\n"
+msgstr ""
+
diff --git a/po/no.po b/po/no.po
index 9cb8f0b..28d624c 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.9c\n"
+"Project-Id-Version: 0.9.9f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2004-10-03 18:07+0400\n"
+"PO-Revision-Date: 2004-12-17 10:56+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"
@@ -484,3 +484,7 @@ msgstr "Maksimal lengde p eksklusjoner (%d) er overskredet.\n"
msgid "only purge cache of older, unreacheable pkgs"
msgstr ""
+#, c-format
+msgid "required too long [%s:%d]\n"
+msgstr "kreves for lang [%s:%d]\n"
+
diff --git a/po/pl.po b/po/pl.po
index fbf7d4f..5420ca5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.9d\n"
+"Project-Id-Version: 0.9.9f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2004-11-08 18:30+0400\n"
+"PO-Revision-Date: 2004-12-17 10:56+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"
@@ -485,3 +485,7 @@ msgstr "Maksymalna dugo wyjtkw (%d) przekroczona.\n"
msgid "only purge cache of older, unreacheable pkgs"
msgstr "usu tylko stare, niedostpne pkgs z cache"
+#, c-format
+msgid "required too long [%s:%d]\n"
+msgstr "required za duy [%s:%d]\n"
+
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d3b743f..229bafb 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.9c\n"
+"Project-Id-Version: 0.9.9f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2004-10-03 18:07+0400\n"
+"PO-Revision-Date: 2004-12-17 10:56+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"
@@ -483,3 +483,7 @@ msgstr "Tamanho máximo dos excluídos (%d) excedido.\n"
msgid "only purge cache of older, unreacheable pkgs"
msgstr ""
+#, c-format
+msgid "required too long [%s:%d]\n"
+msgstr ""
+
diff --git a/po/pt_PT.po b/po/pt_PT.po
index eaf3cb9..9b3eccc 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.9d\n"
+"Project-Id-Version: 0.9.9f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2004-10-03 18:07+0400\n"
+"PO-Revision-Date: 2004-12-17 10:56+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"
@@ -483,3 +483,7 @@ msgstr "Tamanho mximo dos excludos (%d) excedido.\n"
msgid "only purge cache of older, unreacheable pkgs"
msgstr "eliminar da cache apenas os pacotes antigos, desactualizados"
+#, c-format
+msgid "required too long [%s:%d]\n"
+msgstr "requerido muito longo [%s:%d]\n"
+
diff --git a/po/slapt-get.pot b/po/slapt-get.pot
index 098990f..a56c44a 100644
--- a/po/slapt-get.pot
+++ b/po/slapt-get.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.9a\n"
+"Project-Id-Version: 0.9.9f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2004-09-06 21:17+0500\n"
+"PO-Revision-Date: 2004-12-17 10:56+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"
@@ -486,3 +486,7 @@ msgstr ""
msgid "only purge cache of older, unreacheable pkgs"
msgstr ""
+#, c-format
+msgid "required too long [%s:%d]\n"
+msgstr ""
+
diff --git a/po/sv.po b/po/sv.po
index 7aab71a..8fbef8f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.9c\n"
+"Project-Id-Version: 0.9.9f\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2004-10-03 18:07+0400\n"
+"PO-Revision-Date: 2004-12-17 10:56+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"
@@ -484,3 +484,7 @@ msgstr ""
msgid "only purge cache of older, unreacheable pkgs"
msgstr ""
+#, c-format
+msgid "conflict too long [%s:%d]\n"
+msgstr ""
+
diff --git a/src/package.c b/src/package.c
index b37c282..c34a352 100644
--- a/src/package.c
+++ b/src/package.c
@@ -270,7 +270,18 @@ struct pkg_list *parse_packages_txt(FILE *pkg_list_fh){
((char_pointer = strstr(getline_buffer,"PACKAGE REQUIRED")) != NULL)
){
size_t req_len = strlen("PACKAGE REQUIRED") + 2;
+ char *req_str = char_pointer + req_len;
getline_buffer[bytes_read - 1] = '\0';
+
+ if( strlen(req_str) > REQUIRED_LEN ){
+ fprintf( stderr, _("required too long [%s:%d]\n"),
+ req_str,
+ strlen(req_str)
+ );
+ free(tmp_pkg);
+ continue;
+ }
+
strncpy(tmp_pkg->required,char_pointer + req_len, strlen(char_pointer + req_len));
tmp_pkg->required[ strlen(char_pointer + req_len) ] = '\0';
}else{