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

Merge branch 'maint'

Browse Source
This commit is contained in:
Dan McGee 2011-06-15 09:16:08 -05:00
commit 5f404f2cb7
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/Makefile.am
View File

@ -101,7 +101,7 @@ website: html
pkgdatadir = ${datadir}/${PACKAGE} pkgdatadir = ${datadir}/${PACKAGE}
ASCIIDOC_OPTS = \ ASCIIDOC_OPTS = \
-f asciidoc.conf \ -f $(srcdir)/asciidoc.conf \
-a pacman_version="$(REAL_PACKAGE_VERSION)" \ -a pacman_version="$(REAL_PACKAGE_VERSION)" \
-a pacman_date="`date +%Y-%m-%d`" \ -a pacman_date="`date +%Y-%m-%d`" \
-a pkgdatadir=$(pkgdatadir) \ -a pkgdatadir=$(pkgdatadir) \
@ -112,11 +112,12 @@ A2X_OPTS = \
--no-xmllint \ --no-xmllint \
-d manpage \ -d manpage \
-f manpage \ -f manpage \
--xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0' --xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0' \
--destination-dir='./'
# These rules are due to the includes and files of the asciidoc text # These rules are due to the includes and files of the asciidoc text
$(ASCIIDOC_MANS): asciidoc.conf footer.txt $(ASCIIDOC_MANS): asciidoc.conf footer.txt
a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.txt a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" $(srcdir)/$@.txt
%.html: %.txt %.html: %.txt
asciidoc $(ASCIIDOC_OPTS) $*.txt asciidoc $(ASCIIDOC_OPTS) $*.txt

2
src/pacman/util.c
View File

@ -583,7 +583,7 @@ void list_display(const char *title, const alpm_list_t *list)
const char *str = alpm_list_getdata(list); const char *str = alpm_list_getdata(list);
printf("%s", str); printf("%s", str);
cols += string_length(str); cols += string_length(str);
for(i = alpm_list_next(list), cols = len; i; i = alpm_list_next(i)) { for(i = alpm_list_next(list); i; i = alpm_list_next(i)) {
const char *str = alpm_list_getdata(i); const char *str = alpm_list_getdata(i);
int s = string_length(str); int s = string_length(str);
/* wrap only if we have enough usable column space */ /* wrap only if we have enough usable column space */