Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
apk-tools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
61
Issues
61
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
apk-tools
Commits
ac7616b0
Commit
ac7616b0
authored
Jun 27, 2013
by
Dubiousjim
Committed by
Timo Teräs
Jun 28, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
various: applet help text and comment fixes
Acked-by:
Natanael Copa
<
ncopa@alpinelinux.org
>
parent
fcb540ab
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
21 additions
and
22 deletions
+21
-22
src/add.c
src/add.c
+3
-2
src/apk.c
src/apk.c
+1
-1
src/apk_package.h
src/apk_package.h
+1
-1
src/archive.c
src/archive.c
+1
-1
src/database.c
src/database.c
+6
-8
src/dot.c
src/dot.c
+1
-1
src/fetch.c
src/fetch.c
+1
-1
src/index.c
src/index.c
+1
-1
src/info.c
src/info.c
+2
-2
src/lua-apk.c
src/lua-apk.c
+1
-1
src/search.c
src/search.c
+1
-1
src/ver.c
src/ver.c
+2
-2
No files found.
src/add.c
View file @
ac7616b0
...
...
@@ -154,14 +154,15 @@ static struct apk_option add_options[] = {
{
'u'
,
"upgrade"
,
"Prefer to upgrade package"
},
{
't'
,
"virtual"
,
"Instead of adding all the packages to 'world', create a new virtual "
"package with the listed dependencies and add that to 'world'
. T
he "
"package with the listed dependencies and add that to 'world'
; t
he "
"actions of the command are easily reverted by deleting the virtual "
"package"
,
required_argument
,
"NAME"
},
};
static
struct
apk_applet
apk_add
=
{
.
name
=
"add"
,
.
help
=
"Add/update PACKAGEs to main dependencies and install them"
,
.
help
=
"Add PACKAGEs to main dependencies and install (or upgrade) "
"them, while ensuring that all dependencies are met"
,
.
arguments
=
"PACKAGE..."
,
.
open_flags
=
APK_OPENF_WRITE
,
.
context_size
=
sizeof
(
struct
add_ctx
),
...
...
src/apk.c
View file @
ac7616b0
...
...
@@ -42,7 +42,7 @@ static struct apk_option generic_options[] = {
{
'X'
,
"repository"
,
"Use packages from REPO"
,
required_argument
,
"REPO"
},
{
'q'
,
"quiet"
,
"Print less information"
},
{
'v'
,
"verbose"
,
"Print more information"
},
{
'v'
,
"verbose"
,
"Print more information
(can be doubled)
"
},
{
'i'
,
"interactive"
,
"Ask confirmation for certain operations"
},
{
'V'
,
"version"
,
"Print program version and exit"
},
{
'f'
,
"force"
,
"Do what was asked even if it looks dangerous"
},
...
...
src/apk_package.h
View file @
ac7616b0
/* apk_
databas
e.h - Alpine Package Keeper (APK)
/* apk_
packag
e.h - Alpine Package Keeper (APK)
*
* Copyright (C) 2005-2008 Natanael Copa <n@tanael.org>
* Copyright (C) 2008-2011 Timo Teräs <timo.teras@iki.fi>
...
...
src/archive.c
View file @
ac7616b0
...
...
@@ -45,7 +45,7 @@ struct tar_header {
char
devmajor
[
8
];
/* 329-336 */
char
devminor
[
8
];
/* 337-344 */
char
prefix
[
155
];
/* 345-499 */
char
padding
[
12
];
/* 500-51
2
*/
char
padding
[
12
];
/* 500-51
1
*/
};
struct
apk_tar_digest_info
{
...
...
src/database.c
View file @
ac7616b0
...
...
@@ -1119,12 +1119,10 @@ static int apk_db_read_state(struct apk_database *db, int flags)
int
r
;
/* Read:
* 1. installed repository
* 2. source repositories
* 3. master dependencies
* 4. package statuses
* 5. files db
* 6. script db
* 1. /etc/apk/world
* 2. installed packages db
* 3. triggers db
* 4. scripts db
*/
if
(
!
(
flags
&
APK_OPENF_NO_WORLD
))
{
blob
=
world
=
apk_blob_from_file
(
db
->
root_fd
,
apk_world_file
);
...
...
@@ -1574,14 +1572,14 @@ int apk_db_open(struct apk_database *db, struct apk_db_options *dbopts)
db
->
cache_fd
=
fd
;
if
((
dbopts
->
open_flags
&
(
APK_OPENF_WRITE
|
APK_OPENF_CACHE_WRITE
))
&&
fstatvfs
(
fd
,
&
stvfs
)
==
0
&&
(
stvfs
.
f_flag
&
ST_RDONLY
)
!=
0
)
{
/* remount cache read
-
write */
/* remount cache read
/
write */
db
->
cache_remount_dir
=
find_mountpoint
(
db
->
root_fd
,
db
->
cache_dir
);
if
(
db
->
cache_remount_dir
==
NULL
)
{
apk_warning
(
"Unable to find cache directory mount point"
);
}
else
if
(
do_remount
(
db
->
cache_remount_dir
,
"rw"
)
!=
0
)
{
free
(
db
->
cache_remount_dir
);
db
->
cache_remount_dir
=
NULL
;
apk_error
(
"Unable to remount cache read
-
write"
);
apk_error
(
"Unable to remount cache read
/
write"
);
r
=
EROFS
;
goto
ret_r
;
}
...
...
src/dot.c
View file @
ac7616b0
...
...
@@ -157,7 +157,7 @@ static int dot_main(void *pctx, struct apk_database *db, struct apk_string_array
static
struct
apk_option
dot_options
[]
=
{
{
0x10000
,
"errors"
,
"Output only parts of the graph which are considered "
"erro
rne
us: e.g. cycles and missing packages"
},
"erro
neo
us: e.g. cycles and missing packages"
},
{
0x10001
,
"installed"
,
"Consider only installed packages"
},
};
...
...
src/fetch.c
View file @
ac7616b0
...
...
@@ -260,7 +260,7 @@ static int fetch_main(void *pctx, struct apk_database *db, struct apk_string_arr
static
struct
apk_option
fetch_options
[]
=
{
{
'L'
,
"link"
,
"Create hard links if possible"
},
{
'R'
,
"recursive"
,
"Fetch the PACKAGE and all it
'
s dependencies"
},
{
'R'
,
"recursive"
,
"Fetch the PACKAGE and all its dependencies"
},
{
's'
,
"stdout"
,
"Dump the .apk to stdout (incompatible with -o and -R)"
},
{
'o'
,
"output"
,
"Directory to place the PACKAGEs to"
,
...
...
src/index.c
View file @
ac7616b0
...
...
@@ -245,7 +245,7 @@ static struct apk_option index_options[] = {
{
'd'
,
"description"
,
"Embed TEXT as description and version "
"information of the repository index"
,
required_argument
,
"TEXT"
},
{
0x10000
,
"rewrite-arch"
,
"Use ARCH as archite
ry
for all packages"
,
{
0x10000
,
"rewrite-arch"
,
"Use ARCH as archite
cture
for all packages"
,
required_argument
,
"ARCH"
},
};
...
...
src/info.c
View file @
ac7616b0
...
...
@@ -419,8 +419,8 @@ static struct apk_option info_options[] = {
{
'P'
,
"provides"
,
"List virtual packages provided by PACKAGE"
},
{
'r'
,
"rdepends"
,
"List all packages depending on PACKAGE"
},
{
0x10000
,
"replaces"
,
"List packages whom files PACKAGE might replace"
},
{
'i'
,
"install-if"
,
"List the PACKAGE's install
-
if rule"
},
{
'I'
,
"rinstall-if"
,
"List all packages having install
-
if referencing PACKAGE"
},
{
'i'
,
"install-if"
,
"List the PACKAGE's install
_
if rule"
},
{
'I'
,
"rinstall-if"
,
"List all packages having install
_
if referencing PACKAGE"
},
{
'w'
,
"webpage"
,
"Show URL for more information about PACKAGE"
},
{
's'
,
"size"
,
"Show installed size of PACKAGE"
},
{
'd'
,
"description"
,
"Print description for PACKAGE"
},
...
...
src/lua-apk.c
View file @
ac7616b0
...
...
@@ -75,7 +75,7 @@ static int Pversion_compare(lua_State *L)
}
/* version_is_less(verstr1, verstr2)
returns
either '<', '=' or '>
'
returns
whether version is '<
'
*/
static
int
Pversion_is_less
(
lua_State
*
L
)
{
...
...
src/search.c
View file @
ac7616b0
/*
info
.c - Alpine Package Keeper (APK)
/*
search
.c - Alpine Package Keeper (APK)
*
* Copyright (C) 2005-2009 Natanael Copa <n@tanael.org>
* Copyright (C) 2008-2011 Timo Teräs <timo.teras@iki.fi>
...
...
src/ver.c
View file @
ac7616b0
...
...
@@ -186,8 +186,8 @@ static struct apk_option ver_options[] = {
{
't'
,
"test"
,
"Compare two given versions"
},
{
'c'
,
"check"
,
"Check if the given version string is valid"
},
{
'a'
,
"all"
,
"Consider packages from all repository tags"
},
{
'l'
,
"limit"
,
"Limit output to packages with status matching one of LIMCHAR
S
"
,
required_argument
,
"LIMCHAR
S
"
},
{
'l'
,
"limit"
,
"Limit output to packages with status matching one of LIMCHAR
s
"
,
required_argument
,
"LIMCHAR
s
"
},
};
static
struct
apk_applet
apk_ver
=
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment