moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Dan McGee 2011-11-07 09:16:10 -06:00
parent 90477f156c e7b56f48d7
commit 1a994bf180
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libalpm/util.c
View File

@ -217,7 +217,7 @@ char *_alpm_strtrim(char *str)
size_t _alpm_strip_newline(char *str)
{
size_t len;
if(str == '\0') {
if(*str == '\0') {
return 0;
}
len = strlen(str);

4
scripts/makepkg.sh.in
View File

@ -334,7 +334,7 @@ in_array() {
source_has_signatures(){
local file
for file in "${source[@]}"; do
if [[ $file = *.@(sig|asc) ]]; then
if [[ $file = *.@(sig?(n)|asc) ]]; then
return 0
fi
done
@ -704,7 +704,7 @@ check_pgpsigs() {
for file in "${source[@]}"; do
file="$(get_filename "$file")"
if [[ ! $file = *.@(sig|asc) ]]; then
if [[ ! $file = *.@(sig?(n)|asc) ]]; then
continue
fi

7
src/pacman/callback.c
View File

@ -699,8 +699,11 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
xfered_human = humanize_size(xfered, '\0', &xfered_label);
printf(" %ls%-*s ", wcfname, padwid, "");
/* We will show 1.6M/s, 11.6M/s, but 116K/s and 1116K/s */
if(rate_human < 100.0) {
/* We will show 1.62M/s, 11.6M/s, but 116K/s and 1116K/s */
if(rate_human < 9.995) {
printf("%6.1f %3s %4.2f%c/s ",
xfered_human, xfered_label, rate_human, rate_label[0]);
} else if(rate_human < 99.95) {
printf("%6.1f %3s %4.1f%c/s ",
xfered_human, xfered_label, rate_human, rate_label[0]);
} else {