moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 15:58:50 -05:00
Code Issues Releases Wiki Activity

Merge branch 'maint'

Browse Source 
Conflicts:
	lib/libalpm/dload.c
	lib/libalpm/po/fi.po
	lib/libalpm/po/libalpm.pot
	po/de.po
	po/fi.po
	src/pacman/po/pacman.pot
	src/pacman/util.c
This commit is contained in:
Dan McGee 2011-08-08 17:05:25 -05:00
commit 8fa330335f
9 changed files with 62 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/PKGBUILD.5.txt
View File

@ -401,8 +401,7 @@ from (e.g., 'makepkg-git', 'mplayer-svn').
The SVN module to fetch.
*Git*::
The generated pkgver will be one formatted by the 'git-describe'
command, with '-' characters converted to '_' characters.
The generated pkgver will be the date the package is built.
*_gitroot*;;
The URL (all protocols supported) to the GIT repository.

17
lib/libalpm/po/fi.po
View File

@ -1,16 +1,21 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# <larso@gmx.com>, 2011.
# Larso <larso@gmx.com>, 2011.
# Jesse Jaara <jesse.jaara@gmail.com>, 2011.
# apuasi <kaannokset.hellberg@gmail.com>, 2011.
# Dan McGee <dpmcgee@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-06-23 21:48-0500\n"
"PO-Revision-Date: 2011-04-18 11:10+0000\n"
"Last-Translator: apuasi <kaannokset.hellberg@gmail.com>\n"
"Language-Team: Finnish <None>\n"
"POT-Creation-Date: 2011-08-08 16:37-0500\n"
"PO-Revision-Date: 2011-07-28 22:14+0000\n"
"Last-Translator: Larso <larso@gmx.com>\n"
"Language-Team: Finnish (http://www.transifex.net/projects/p/archlinux-pacman/"
"team/fi/)\n"
"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -319,7 +324,7 @@ msgstr "toimenpidettä ei ole alustettu"
#, c-format
msgid "duplicate target"
msgstr ""
msgstr "kohde on useampaan kertaan"
#, c-format
msgid "transaction not prepared"

2
lib/libalpm/po/libalpm.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pacman 3.5.3\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-06-23 21:48-0500\n"
"POT-Creation-Date: 2011-08-08 16:37-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
scripts/po/de.po
View File

@ -379,7 +379,7 @@ msgid ""
" --holdver Prevent automatic version bumping for development %ss"
msgstr ""
" --holdver Verhindert die automatische Erhöhung der Versionsnummer "
"für die Entwickler-Vesrion %ss"
"für die Entwickler-Version %ss"
msgid ""
" --key <key> Specify a key to use for gpg signing instead of the "

2
src/pacman/po/de.po
View File

@ -276,7 +276,7 @@ msgstr ""
#, c-format
msgid "%s: install reason has been set to 'explicitly installed'\n"
msgstr ""
"%s: Installations-Grund wurde auf \"Ausdrücklich installiert\" gesetzt?\n"
"%s: Installations-Grund wurde auf \"Ausdrücklich installiert\" gesetzt\n"
#, c-format
msgid "Explicitly installed"

2
src/pacman/po/fi.po
View File

@ -851,7 +851,7 @@ msgstr "Säilytettävät paketit:\n"
#, c-format
msgid " All locally installed packages\n"
msgstr " Kaikki paikalliset paketit\n"
msgstr " Kaikki asennetut paketit\n"
#, c-format
msgid " All current sync database packages\n"

2
src/pacman/po/pacman.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pacman 3.5.3\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-06-23 21:59-0500\n"
"POT-Creation-Date: 2011-08-08 16:32-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

11
src/pacman/sync.c
View File

@ -628,7 +628,15 @@ static int process_group(alpm_list_t *dbs, const char *group)
group);
select_display(pkgs);
char *array = malloc(count);
multiselect_question(array, count);
if(!array) {
ret = 1;
goto cleanup;
}
if(multiselect_question(array, count)) {
ret = 1;
free(array);
goto cleanup;
}
int n = 0;
for(i = pkgs; i; i = alpm_list_next(i)) {
if(array[n++] == 0)
@ -641,6 +649,7 @@ static int process_group(alpm_list_t *dbs, const char *group)
goto cleanup;
}
}
free(array);
} else {
for(i = pkgs; i; i = alpm_list_next(i)) {
alpm_pkg_t *pkg = alpm_list_getdata(i);

38
src/pacman/util.c
View File

@ -1134,8 +1134,9 @@ static int multiselect_parse(char *array, int count, char *response)
int multiselect_question(char *array, int count)
{
char response[64];
char *response, *lastchar;
FILE *stream;
size_t response_len = 64;
if(config->noconfirm) {
stream = stdout;
@ -1144,12 +1145,21 @@ int multiselect_question(char *array, int count)
stream = stderr;
}
response = malloc(response_len);
if(!response) {
return -1;
}
lastchar = response + response_len - 1;
/* sentinel byte to later see if we filled up the entire string */
*lastchar = 1;
while(1) {
memset(array, 1, count);
fprintf(stream, "\n");
fprintf(stream, _("Enter a selection (default=all)"));
fprintf(stream, ": ");
fflush(stream);
if(config->noconfirm) {
fprintf(stream, "\n");
@ -1158,7 +1168,24 @@ int multiselect_question(char *array, int count)
flush_term_input();
if(fgets(response, sizeof(response), stdin)) {
if(fgets(response, response_len, stdin)) {
const size_t response_incr = 64;
/* handle buffer not being large enough to read full line case */
while(*lastchar == '\0' && lastchar[-1] != '\n') {
response_len += response_incr;
response = realloc(response, response_len);
if(!response) {
return -1;
}
lastchar = response + response_len - 1;
/* sentinel byte */
*lastchar = 1;
if(fgets(response + response_len - response_incr - 1,
response_incr + 1, stdin) == 0) {
free(response);
return -1;
}
}
strtrim(response);
if(strlen(response) > 0) {
if(multiselect_parse(array, count, response) == -1) {
@ -1166,9 +1193,14 @@ int multiselect_question(char *array, int count)
continue;
}
}
break;
} else {
free(response);
return -1;
}
break;
}
free(response);
return 0;
}