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
60
Issues
60
List
Boards
Labels
Service Desk
Milestones
Merge Requests
14
Merge Requests
14
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
3e6fc138
Commit
3e6fc138
authored
Jan 16, 2009
by
Timo Teräs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add: --upgrade|-u to control if upgrading is preferred or not
parent
6354a278
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
17 additions
and
21 deletions
+17
-21
src/add.c
src/add.c
+8
-4
src/apk.c
src/apk.c
+1
-1
src/apk_database.h
src/apk_database.h
+0
-1
src/apk_defines.h
src/apk_defines.h
+1
-1
src/apk_package.h
src/apk_package.h
+2
-5
src/apk_state.h
src/apk_state.h
+2
-3
src/package.c
src/package.c
+0
-3
src/state.c
src/state.c
+3
-3
No files found.
src/add.c
View file @
3e6fc138
...
...
@@ -14,7 +14,7 @@
#include "apk_applet.h"
#include "apk_database.h"
#define FLAG_INITDB 0x001
#define FLAG_INITDB 0x00
0
1
struct
add_ctx
{
unsigned
int
flags
;
...
...
@@ -28,6 +28,9 @@ static int add_parse(void *ctx, int optch, int optindex, const char *optarg)
case
0x10000
:
actx
->
flags
|=
FLAG_INITDB
;
break
;
case
'u'
:
apk_upgrade
=
1
;
break
;
default:
return
-
1
;
}
...
...
@@ -73,8 +76,8 @@ static int add_main(void *ctx, int argc, char **argv)
dep
=
(
struct
apk_dependency
)
{
.
name
=
pkg
->
name
,
.
version_mask
=
APK_VERSION_RESULT_MASK
(
APK_VERSION_EQUAL
)
,
.
version
=
pkg
->
version
,
.
min_version
=
pkg
->
version
,
.
max_
version
=
pkg
->
version
,
};
}
else
{
dep
=
(
struct
apk_dependency
)
{
...
...
@@ -91,11 +94,12 @@ err:
static
struct
option
add_options
[]
=
{
{
"initdb"
,
no_argument
,
NULL
,
0x10000
},
{
"upgrade"
,
no_argument
,
NULL
,
'u'
},
};
static
struct
apk_applet
apk_add
=
{
.
name
=
"add"
,
.
usage
=
"[--initdb] apkname..."
,
.
usage
=
"[--initdb]
[--upgrade|-u]
apkname..."
,
.
context_size
=
sizeof
(
struct
add_ctx
),
.
num_options
=
ARRAY_SIZE
(
add_options
),
.
options
=
add_options
,
...
...
src/apk.c
View file @
3e6fc138
...
...
@@ -23,7 +23,7 @@
const
char
*
apk_root
;
const
char
*
apk_repository
=
NULL
;
int
apk_verbosity
=
1
,
apk_progress
=
0
;
int
apk_verbosity
=
1
,
apk_progress
=
0
,
apk_upgrade
=
0
;
int
apk_cwd_fd
;
void
apk_log
(
const
char
*
prefix
,
const
char
*
format
,
...)
...
...
src/apk_database.h
View file @
3e6fc138
...
...
@@ -53,7 +53,6 @@ struct apk_db_dir_instance {
struct
apk_name
{
apk_hash_node
hash_node
;
char
*
name
;
struct
apk_package_array
*
pkgs
;
};
...
...
src/apk_defines.h
View file @
3e6fc138
...
...
@@ -50,7 +50,7 @@ extern csum_t bad_checksum;
#define csum_valid(buf) memcmp(buf, bad_checksum, sizeof(csum_t))
#endif
extern
int
apk_cwd_fd
,
apk_verbosity
,
apk_progress
;
extern
int
apk_cwd_fd
,
apk_verbosity
,
apk_progress
,
apk_upgrade
;
#define apk_error(args...) apk_log("ERROR: ", args);
#define apk_warning(args...) if (apk_verbosity > 0) { apk_log("WARNING: ", args); }
...
...
src/apk_package.h
View file @
3e6fc138
...
...
@@ -36,12 +36,9 @@ struct apk_script {
};
struct
apk_dependency
{
unsigned
conflict
:
1
;
unsigned
prefer_upgrade
:
1
;
unsigned
version_mask
:
3
;
struct
apk_name
*
name
;
char
*
version
;
char
*
min_version
;
char
*
max_version
;
};
APK_ARRAY
(
apk_dependency_array
,
struct
apk_dependency
);
...
...
src/apk_state.h
View file @
3e6fc138
...
...
@@ -15,9 +15,8 @@
#include "apk_database.h"
#define APK_STATE_NOT_CONSIDERED 0
#define APK_STATE_PREFER_UPGRADE 1
#define APK_STATE_INSTALL 2
#define APK_STATE_NO_INSTALL 3
#define APK_STATE_INSTALL 1
#define APK_STATE_NO_INSTALL 2
struct
apk_change
{
struct
list_head
change_list
;
...
...
src/package.c
View file @
3e6fc138
...
...
@@ -112,10 +112,7 @@ static int parse_depend(void *ctx, apk_blob_t blob)
return
-
1
;
*
dep
=
(
struct
apk_dependency
){
.
prefer_upgrade
=
0
,
.
version_mask
=
0
,
.
name
=
name
,
.
version
=
NULL
,
};
return
0
;
...
...
src/state.c
View file @
3e6fc138
...
...
@@ -205,7 +205,7 @@ int apk_state_satisfy_name(struct apk_state *state,
struct
apk_name
*
name
)
{
struct
apk_package
*
preferred
=
NULL
,
*
installed
=
NULL
;
int
i
,
r
,
upgrading
=
1
;
int
i
,
r
;
/* Is something already installed? Or figure out the preferred
* package. */
...
...
@@ -216,9 +216,9 @@ int apk_state_satisfy_name(struct apk_state *state,
if
(
apk_pkg_get_state
(
name
->
pkgs
->
item
[
i
])
==
APK_STATE_INSTALL
)
{
installed
=
name
->
pkgs
->
item
[
i
];
if
(
!
upgrading
)
{
if
(
!
apk_upgrade
)
{
preferred
=
installed
;
continue
;
break
;
}
}
...
...
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