Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Plasma
Discover
Commits
ec3fa261
Commit
ec3fa261
authored
Jan 14, 2021
by
Aleix Pol Gonzalez
🐧
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
flatpak: prevent creating a QByteArray twice
parent
2c4fb72f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp
libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp
+4
-5
No files found.
libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp
View file @
ec3fa261
...
...
@@ -278,7 +278,11 @@ FlatpakResource * FlatpakBackend::addAppFromFlatpakBundle(const QUrl &url)
return
nullptr
;
}
gsize
len
=
0
;
g_autoptr
(
GBytes
)
metadata
=
flatpak_bundle_ref_get_metadata
(
bundleRef
);
const
QByteArray
metadataContent
((
char
*
)
g_bytes_get_data
(
metadata
,
&
len
));
appstreamGz
=
flatpak_bundle_ref_get_appstream
(
bundleRef
);
if
(
appstreamGz
)
{
g_autoptr
(
GZlibDecompressor
)
decompressor
=
nullptr
;
...
...
@@ -329,8 +333,6 @@ FlatpakResource * FlatpakBackend::addAppFromFlatpakBundle(const QUrl &url)
return
nullptr
;
}
gsize
len
=
0
;
QByteArray
metadataContent
=
QByteArray
((
char
*
)
g_bytes_get_data
(
metadata
,
&
len
));
tempFile
.
write
(
metadataContent
);
tempFile
.
close
();
...
...
@@ -344,9 +346,6 @@ FlatpakResource * FlatpakBackend::addAppFromFlatpakBundle(const QUrl &url)
}
FlatpakResource
*
resource
=
new
FlatpakResource
(
asComponent
,
preferredInstallation
(),
this
);
gsize
len
=
0
;
QByteArray
metadataContent
=
QByteArray
((
char
*
)
g_bytes_get_data
(
metadata
,
&
len
));
if
(
!
updateAppMetadata
(
resource
,
metadataContent
))
{
delete
resource
;
qWarning
()
<<
"Failed to update metadata from app bundle"
;
...
...
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