bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint'

Browse source
This commit is contained in:
Dan McGee 2012-09-18 08:36:10 -05:00
commit 369c5aa7dd
4 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/makepkg.conf.5.txt
View file

@ -25,6 +25,10 @@ build environment.
NOTE: This does not guarantee that all package Makefiles will use your exported NOTE: This does not guarantee that all package Makefiles will use your exported
variables. Some of them are non-standard. variables. Some of them are non-standard.
The system-wide configuration file is found in {sysconfdir}/makepkg.conf.
Individual options can be overridden (or added to) on a per user basis in
~/.makepkg.conf.
The default file is fairly well commented, so it may be easiest to simply The default file is fairly well commented, so it may be easiest to simply
follow directions given there for customization. follow directions given there for customization.

3
doc/pacman.8.txt
View file

@ -401,9 +401,6 @@ system upgrade and install/upgrade the foo package in the same operation.
will force a refresh of all package lists even if they appear to be up will force a refresh of all package lists even if they appear to be up
to date. to date.
*\--needed*::
Do not reinstall the targets that are already up to date.
Handling Config Files[[HCF]] Handling Config Files[[HCF]]
---------------------------- ----------------------------

5
lib/libalpm/signing.c
View file

@ -530,6 +530,11 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path,
string_validity(gpgsig->validity), string_validity(gpgsig->validity),
gpgme_strerror(gpgsig->validity_reason)); gpgme_strerror(gpgsig->validity_reason));
if((time_t)gpgsig->timestamp > time(NULL)) {
_alpm_log(handle, ALPM_LOG_WARNING,
_("System time is greater than signature timestamp.\n"));
}
result = siglist->results + sigcount; result = siglist->results + sigcount;
err = gpgme_get_key(ctx, gpgsig->fpr, &key, 0); err = gpgme_get_key(ctx, gpgsig->fpr, &key, 0);
if(gpg_err_code(err) == GPG_ERR_EOF) { if(gpg_err_code(err) == GPG_ERR_EOF) {

5
test/pacman/pmtest.py
View file

@ -203,9 +203,12 @@ class pmtest(object):
if pacman["gdb"]: if pacman["gdb"]:
cmd.extend(["libtool", "execute", "gdb", "--args"]) cmd.extend(["libtool", "execute", "gdb", "--args"])
if pacman["valgrind"]: if pacman["valgrind"]:
suppfile = os.path.join(os.path.dirname(__file__),
'..', '..', 'valgrind.supp')
cmd.extend(["libtool", "execute", "valgrind", "-q", cmd.extend(["libtool", "execute", "valgrind", "-q",
"--tool=memcheck", "--leak-check=full", "--tool=memcheck", "--leak-check=full",
"--show-reachable=yes", "--suppressions=%s/valgrind.supp" % os.getcwd()]) "--show-reachable=yes",
"--suppressions=%s" % suppfile])
cmd.extend([pacman["bin"], cmd.extend([pacman["bin"],
"--config", os.path.join(self.root, util.PACCONF), "--config", os.path.join(self.root, util.PACCONF),
"--root", self.root, "--root", self.root,