Skip to content
This repository has been archived by the owner on May 21, 2024. It is now read-only.

Some more lintian fixes #1242

Merged
merged 5 commits into from
Jun 25, 2019
Merged

Some more lintian fixes #1242

merged 5 commits into from
Jun 25, 2019

Conversation

lbonn
Copy link
Contributor

@lbonn lbonn commented Jun 24, 2019

No description provided.

@lbonn lbonn changed the title Fix/ota 3099/deb no systemctl Some more lintian fixes Jun 24, 2019
tests/CMakeLists.txt Show resolved Hide resolved
if [ "$1" = "purge" ]; then
if [ -x "/usr/bin/deb-systemd-helper" ]; then
deb-systemd-helper purge 'aktualizr.service' >/dev/null || true
deb-systemd-helper unmask 'aktualizr.service' >/dev/null || true
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this all just to remove it if it is still running? We're no longer running it as a daemon anymore, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes that's right. I've actually been using the network-manager debian package as a model. They use an automated debian tool to generate these steps actually but I think it would be impractical to do that through CMake/CPack which is quite rudimentary.

The intent is just to add testutilities to the list

Also remove the redundant gcov link, already done in CodeCoverage.cmake.

Signed-off-by: Laurent Bonnans <[email protected]>
And use deb-systemd-helper instead of systemctl, as recommended by
lintian

Signed-off-by: Laurent Bonnans <[email protected]>
It's unused right now

Signed-off-by: Laurent Bonnans <[email protected]>
* provide a long description
* `set -e` in maintainer scripts

Signed-off-by: Laurent Bonnans <[email protected]>
In case the package was removed before (and systemd service masked)

Signed-off-by: Laurent Bonnans <[email protected]>
@lbonn lbonn force-pushed the fix/OTA-3099/deb-no-systemctl branch from 8b94dbd to 7a43daa Compare June 25, 2019 08:50
@codecov-io
Copy link

Codecov Report

Merging #1242 into master will increase coverage by 0.26%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1242      +/-   ##
==========================================
+ Coverage   79.27%   79.53%   +0.26%     
==========================================
  Files         170      170              
  Lines       10140    10140              
==========================================
+ Hits         8038     8065      +27     
+ Misses       2102     2075      -27
Impacted Files Coverage Δ
src/libaktualizr/primary/sotauptaneclient.cc 92.77% <0%> (+0.6%) ⬆️
src/libaktualizr/uptane/imagesrepository.cc 93.2% <0%> (+0.61%) ⬆️
src/libaktualizr/storage/sql_utils.h 84.5% <0%> (+1.4%) ⬆️
src/libaktualizr/uptane/directorrepository.cc 97.14% <0%> (+1.42%) ⬆️
src/libaktualizr/storage/sqlstorage.cc 76.44% <0%> (+1.67%) ⬆️
src/libaktualizr/package_manager/ostreemanager.cc 78.38% <0%> (+2.96%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c9826b1...7a43daa. Read the comment docs.

Copy link
Collaborator

@pattivacek pattivacek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't tested but looks fine. Once we make a new release with this change we should double-check with QA (FYI @Raigi) that everything looks okay and works as expected for their tools/tests.

@lbonn lbonn merged commit b706c2f into master Jun 25, 2019
@lbonn lbonn deleted the fix/OTA-3099/deb-no-systemctl branch June 25, 2019 14:50
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants