diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-27 14:54:40 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-27 14:54:40 +0900 |
| commit | 70c6207bfdb27f170377015f65f22e8ba50f6a10 (patch) | |
| tree | c7de4059dfc4518bbbf5c3b8a5925f441487b743 /doc | |
| parent | 9d82811ac90c5db61fca60e3e7c95ba58bc66393 (diff) | |
| download | libsolv-70c6207bfdb27f170377015f65f22e8ba50f6a10.tar.gz libsolv-70c6207bfdb27f170377015f65f22e8ba50f6a10.tar.bz2 libsolv-70c6207bfdb27f170377015f65f22e8ba50f6a10.zip | |
Imported Upstream version 0.6.13upstream/0.6.13
Change-Id: I9fed388d0b8658275d9089b22473596379566069
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/filters/xcode.pl | 2 | ||||
| -rw-r--r-- | doc/libsolv-bindings.3 | 13 | ||||
| -rw-r--r-- | doc/libsolv-bindings.txt | 5 |
3 files changed, 15 insertions, 5 deletions
diff --git a/doc/filters/xcode.pl b/doc/filters/xcode.pl index 089f511..407641f 100755 --- a/doc/filters/xcode.pl +++ b/doc/filters/xcode.pl @@ -36,7 +36,7 @@ while(<STDIN>) { $_ = " $_"; $_ = "$_ "; if (s/^ TCL +/ /) { - s/(\$[a-zA-Z_][a-zA-Z0-9_]*)/<-S><I>$1<-I><S>/g; + s/(\$[a-zA-Z_][a-zA-Z0-9_:]*)/<-S><I>$1<-I><S>/g; } else { s/(?<=[^a-zA-Z_\&:\.\'\";])(?!solv\W|Solv\W|Pool\W)([\$\@a-zA-Z_][a-zA-Z0-9_]*)(?=[^a-zA-Z0-9_\(;\[])(?!::)(?! [^=])/<-S><I>$1<-I><S>/g; } diff --git a/doc/libsolv-bindings.3 b/doc/libsolv-bindings.3 index 9fe26c1..ad8a7e6 100644 --- a/doc/libsolv-bindings.3 +++ b/doc/libsolv-bindings.3 @@ -2,12 +2,12 @@ .\" Title: Libsolv-Bindings .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/> -.\" Date: 08/28/2015 +.\" Date: 09/21/2015 .\" Manual: LIBSOLV .\" Source: libsolv .\" Language: English .\" -.TH "LIBSOLV\-BINDINGS" "3" "08/28/2015" "libsolv" "LIBSOLV" +.TH "LIBSOLV\-BINDINGS" "3" "09/21/2015" "libsolv" "LIBSOLV" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -399,8 +399,8 @@ Swig implements all constants as numeric variables, constants belonging to a lib .RS 4 .\} .nf -\fI$pool\fR \fBset_flag\fR \fI$solv\fR\fB::Pool_POOL_FLAG_OBSOLETEUSESCOLORS 1\fR -\fBputs [\fR\fI$solvable\fR \fBlookup_str\fR \fI$solv\fR\fB::SOLVABLE_SUMMARY]\fR +\fI$pool\fR \fBset_flag\fR \fI$solv::Pool_POOL_FLAG_OBSOLETEUSESCOLORS\fR \fB1\fR +\fBputs [\fR\fI$solvable\fR \fBlookup_str\fR \fI$solv::SOLVABLE_SUMMARY\fR\fB]\fR .fi .if n \{\ .RE @@ -3251,6 +3251,11 @@ Fix dependency problems of matching installed packages\&. The default is to igno The matching installed packages are considered to be installed by a user, thus not installed to fulfill some dependency\&. This is needed input for the calculation of unneeded packages for jobs that have the SOLVER_CLEANDEPS flag set\&. .RE .PP +\fBSOLVER_ALLOWUNINSTALL\fR +.RS 4 +Allow the solver to deinstall the matching installed packages if they get into the way of resolving a dependency\&. This is like the SOLVER_FLAG_ALLOW_UNINSTALL flag, but limited to a specific set of packages\&. +.RE +.PP \fBSOLVER_JOBMASK\fR .RS 4 A mask containing all the above action bits\&. diff --git a/doc/libsolv-bindings.txt b/doc/libsolv-bindings.txt index 175d922..13d73bd 100644 --- a/doc/libsolv-bindings.txt +++ b/doc/libsolv-bindings.txt @@ -1873,6 +1873,11 @@ thus not installed to fulfill some dependency. This is needed input for the calculation of unneeded packages for jobs that have the SOLVER_CLEANDEPS flag set. +*SOLVER_ALLOWUNINSTALL*:: +Allow the solver to deinstall the matching installed packages if they get +into the way of resolving a dependency. This is like the +SOLVER_FLAG_ALLOW_UNINSTALL flag, but limited to a specific set of packages. + *SOLVER_JOBMASK*:: A mask containing all the above action bits. |