mirror of
https://github.com/moparisthebest/pacman
synced 2024-10-31 15:45:03 -04:00
Merge branch 'maint'
This commit is contained in:
commit
41da225336
@ -92,9 +92,9 @@ html: $(HTML_DOCS)
|
|||||||
website: html
|
website: html
|
||||||
bsdtar czf website.tar.gz $(HTML_DOCS) \
|
bsdtar czf website.tar.gz $(HTML_DOCS) \
|
||||||
-C /etc/asciidoc/stylesheets/ \
|
-C /etc/asciidoc/stylesheets/ \
|
||||||
xhtml11.css xhtml11-manpage.css xhtml11-quirks.css \
|
asciidoc.css asciidoc-manpage.css \
|
||||||
-C /etc/asciidoc/javascripts/ \
|
-C /etc/asciidoc/javascripts/ \
|
||||||
asciidoc-xhtml11.js \
|
asciidoc.js \
|
||||||
-C /etc/asciidoc/ \
|
-C /etc/asciidoc/ \
|
||||||
images
|
images
|
||||||
|
|
||||||
|
@ -17,7 +17,11 @@ plus=+
|
|||||||
caret=^
|
caret=^
|
||||||
startsb=[
|
startsb=[
|
||||||
endsb=]
|
endsb=]
|
||||||
|
backslash=\
|
||||||
tilde=~
|
tilde=~
|
||||||
|
apostrophe='
|
||||||
|
backtick=`
|
||||||
|
litdd=--
|
||||||
|
|
||||||
ifdef::backend-docbook[]
|
ifdef::backend-docbook[]
|
||||||
[linkman-inlinemacro]
|
[linkman-inlinemacro]
|
||||||
|
@ -53,7 +53,7 @@ Options
|
|||||||
in linkman:makepkg.conf[5].
|
in linkman:makepkg.conf[5].
|
||||||
|
|
||||||
*\--config* <file>::
|
*\--config* <file>::
|
||||||
Use an alternate config file instead of the `{sysconfdir}/makepkg.conf`
|
Use an alternate config file instead of the +{sysconfdir}/makepkg.conf+
|
||||||
default.
|
default.
|
||||||
|
|
||||||
*-d, \--nodeps*::
|
*-d, \--nodeps*::
|
||||||
|
@ -117,7 +117,7 @@ Options
|
|||||||
-------
|
-------
|
||||||
*-b, \--dbpath* <path>::
|
*-b, \--dbpath* <path>::
|
||||||
Specify an alternative database location (a typical default is
|
Specify an alternative database location (a typical default is
|
||||||
`{localstatedir}/lib/pacman`). This should not be used unless you know what you are
|
+{localstatedir}/lib/pacman+). This should not be used unless you know what you are
|
||||||
doing. *NOTE*: if specified, this is an absolute path and the root path is
|
doing. *NOTE*: if specified, this is an absolute path and the root path is
|
||||||
not automatically prepended.
|
not automatically prepended.
|
||||||
|
|
||||||
@ -138,7 +138,7 @@ Options
|
|||||||
|
|
||||||
*\--cachedir* <dir>::
|
*\--cachedir* <dir>::
|
||||||
Specify an alternative package cache location (a typical default is
|
Specify an alternative package cache location (a typical default is
|
||||||
`{localstatedir}/cache/pacman/pkg`). Multiple cache directories can be specified,
|
+{localstatedir}/cache/pacman/pkg+). Multiple cache directories can be specified,
|
||||||
and they are tried in the order they are passed to pacman. *NOTE*: this
|
and they are tried in the order they are passed to pacman. *NOTE*: this
|
||||||
is an absolute path, the root path is not automatically prepended.
|
is an absolute path, the root path is not automatically prepended.
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ NoUpgrade = etc/passwd etc/group etc/shadow
|
|||||||
NoUpgrade = etc/fstab
|
NoUpgrade = etc/fstab
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
Include = {sysconfdir}/pacman.d/core
|
Include = /etc/pacman.d/core
|
||||||
|
|
||||||
[custom]
|
[custom]
|
||||||
Server = file:///home/pkgs
|
Server = file:///home/pkgs
|
||||||
@ -57,13 +57,13 @@ Options
|
|||||||
|
|
||||||
*DBPath =* path/to/db/dir::
|
*DBPath =* path/to/db/dir::
|
||||||
Overrides the default location of the toplevel database directory. A
|
Overrides the default location of the toplevel database directory. A
|
||||||
typical default is `{localstatedir}/lib/pacman/`. Most users will not need to set
|
typical default is +{localstatedir}/lib/pacman/+. Most users will not need to set
|
||||||
this option. *NOTE*: if specified, this is an absolute path and the root
|
this option. *NOTE*: if specified, this is an absolute path and the root
|
||||||
path is not automatically prepended.
|
path is not automatically prepended.
|
||||||
|
|
||||||
*CacheDir =* path/to/cache/dir::
|
*CacheDir =* path/to/cache/dir::
|
||||||
Overrides the default location of the package cache directory. A typical
|
Overrides the default location of the package cache directory. A typical
|
||||||
default is `{localstatedir}/cache/pacman/pkg/`. Multiple cache directories can be
|
default is +{localstatedir}/cache/pacman/pkg/+. Multiple cache directories can be
|
||||||
specified, and they are tried in the order they are listed in the config
|
specified, and they are tried in the order they are listed in the config
|
||||||
file. If a file is not found in any cache directory, it will be downloaded
|
file. If a file is not found in any cache directory, it will be downloaded
|
||||||
to the first cache directory with write access. *NOTE*: this is an absolute
|
to the first cache directory with write access. *NOTE*: this is an absolute
|
||||||
@ -81,7 +81,7 @@ Options
|
|||||||
|
|
||||||
*LogFile =* '/path/to/file'::
|
*LogFile =* '/path/to/file'::
|
||||||
Overrides the default location of the pacman log file. A typical default
|
Overrides the default location of the pacman log file. A typical default
|
||||||
is `{localstatedir}/log/pacman.log`. This is an absolute path and the root directory
|
is +{localstatedir}/log/pacman.log+. This is an absolute path and the root directory
|
||||||
is not prepended.
|
is not prepended.
|
||||||
|
|
||||||
*HoldPkg =* package ...::
|
*HoldPkg =* package ...::
|
||||||
@ -158,7 +158,7 @@ Options
|
|||||||
|
|
||||||
*UseSyslog*::
|
*UseSyslog*::
|
||||||
Log action messages through syslog(). This will insert log entries into
|
Log action messages through syslog(). This will insert log entries into
|
||||||
`{localstatedir}/log/messages` or equivalent.
|
+{localstatedir}/log/messages+ or equivalent.
|
||||||
|
|
||||||
*UseDelta*::
|
*UseDelta*::
|
||||||
Download delta files instead of complete packages if possible. Requires
|
Download delta files instead of complete packages if possible. Requires
|
||||||
@ -225,7 +225,7 @@ directory with these packages so pacman can find it when run with '\--refresh'.
|
|||||||
|
|
||||||
The above command will generate a compressed database named
|
The above command will generate a compressed database named
|
||||||
'/home/pkgs/custom.db.tar.gz'. Note that the database must be of the form
|
'/home/pkgs/custom.db.tar.gz'. Note that the database must be of the form
|
||||||
'{treename}.db.tar.gz', where '{treename}' is the name of the section defined in
|
'\{treename\}.db.tar.gz', where '\{treename\}' is the name of the section defined in
|
||||||
the configuration file. That's it! Now configure your custom section in the
|
the configuration file. That's it! Now configure your custom section in the
|
||||||
configuration file as shown in the config example above. Pacman will now use your
|
configuration file as shown in the config example above. Pacman will now use your
|
||||||
package repository. If you add new packages to the repository, remember to
|
package repository. If you add new packages to the repository, remember to
|
||||||
|
@ -286,7 +286,7 @@ alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, size_t n, alpm_list_fn
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Remove an item from the list.
|
* @brief Remove an item from the list.
|
||||||
* item is not freed; this is the responsiblity of the caller.
|
* item is not freed; this is the responsibility of the caller.
|
||||||
*
|
*
|
||||||
* @param haystack the list to remove the item from
|
* @param haystack the list to remove the item from
|
||||||
* @param item the item to remove from the list
|
* @param item the item to remove from the list
|
||||||
|
@ -44,8 +44,6 @@ pmhandle_t *_alpm_handle_new()
|
|||||||
{
|
{
|
||||||
pmhandle_t *handle;
|
pmhandle_t *handle;
|
||||||
|
|
||||||
ALPM_LOG_FUNC;
|
|
||||||
|
|
||||||
CALLOC(handle, 1, sizeof(pmhandle_t), RET_ERR(PM_ERR_MEMORY, NULL));
|
CALLOC(handle, 1, sizeof(pmhandle_t), RET_ERR(PM_ERR_MEMORY, NULL));
|
||||||
|
|
||||||
handle->sigverify = PM_PGP_VERIFY_OPTIONAL;
|
handle->sigverify = PM_PGP_VERIFY_OPTIONAL;
|
||||||
|
@ -54,6 +54,8 @@ static int make_lock(pmhandle_t *handle)
|
|||||||
int fd;
|
int fd;
|
||||||
char *dir, *ptr;
|
char *dir, *ptr;
|
||||||
|
|
||||||
|
ASSERT(handle->lockfile != NULL, return -1);
|
||||||
|
|
||||||
/* create the dir of the lockfile first */
|
/* create the dir of the lockfile first */
|
||||||
dir = strdup(handle->lockfile);
|
dir = strdup(handle->lockfile);
|
||||||
ptr = strrchr(dir, '/');
|
ptr = strrchr(dir, '/');
|
||||||
@ -106,7 +108,6 @@ int SYMEXPORT alpm_trans_init(pmtransflag_t flags,
|
|||||||
|
|
||||||
/* Sanity checks */
|
/* Sanity checks */
|
||||||
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
|
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
|
||||||
|
|
||||||
ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1));
|
ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1));
|
||||||
|
|
||||||
/* lock db */
|
/* lock db */
|
||||||
|
Loading…
Reference in New Issue
Block a user