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
59
Issues
59
List
Boards
Labels
Service Desk
Milestones
Merge Requests
14
Merge Requests
14
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
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
fc57b731
Commit
fc57b731
authored
Jan 16, 2012
by
Timo Teräs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
db: fix loading of world after previous commits
parent
2ea61da9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
src/database.c
src/database.c
+3
-3
No files found.
src/database.c
View file @
fc57b731
...
@@ -902,7 +902,7 @@ static int apk_db_read_state(struct apk_database *db, int flags)
...
@@ -902,7 +902,7 @@ static int apk_db_read_state(struct apk_database *db, int flags)
{
{
struct
apk_istream
*
is
;
struct
apk_istream
*
is
;
struct
apk_bstream
*
bs
;
struct
apk_bstream
*
bs
;
apk_blob_t
blob
;
apk_blob_t
blob
,
world
;
int
r
;
int
r
;
/* Read:
/* Read:
...
@@ -914,14 +914,14 @@ static int apk_db_read_state(struct apk_database *db, int flags)
...
@@ -914,14 +914,14 @@ static int apk_db_read_state(struct apk_database *db, int flags)
* 6. script db
* 6. script db
*/
*/
if
(
!
(
flags
&
APK_OPENF_NO_WORLD
))
{
if
(
!
(
flags
&
APK_OPENF_NO_WORLD
))
{
blob
=
apk_blob_from_file
(
db
->
root_fd
,
apk_world_file
);
blob
=
world
=
apk_blob_from_file
(
db
->
root_fd
,
apk_world_file
);
if
(
APK_BLOB_IS_NULL
(
blob
))
if
(
APK_BLOB_IS_NULL
(
blob
))
return
-
ENOENT
;
return
-
ENOENT
;
blob
=
apk_blob_trim
(
blob
);
blob
=
apk_blob_trim
(
blob
);
if
(
apk_blob_chr
(
blob
,
' '
))
if
(
apk_blob_chr
(
blob
,
' '
))
db
->
compat_old_world
=
1
;
db
->
compat_old_world
=
1
;
apk_blob_pull_deps
(
&
blob
,
db
,
&
db
->
world
);
apk_blob_pull_deps
(
&
blob
,
db
,
&
db
->
world
);
free
(
blob
.
ptr
);
free
(
world
.
ptr
);
}
}
if
(
!
(
flags
&
APK_OPENF_NO_INSTALLED
))
{
if
(
!
(
flags
&
APK_OPENF_NO_INSTALLED
))
{
...
...
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