Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/66'

Browse Source 
* origin/pr/66:
  fixed qubes-core-agent upgrading double package manager lock

  Fixes QubesOS/qubes-issues#1889
This commit is contained in:
Marek Marczykowski-Górecki 2016-07-13 22:38:25 +02:00
commit 6cf30bff29
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
misc/upgrades-installed-check
View File

@ -17,9 +17,10 @@ elif [ -e /etc/debian_version ]; then
## Debian ## Debian
set -e set -e
set -o pipefail set -o pipefail
apt_get_output="$(LANG="C" apt-get -s upgrade 2>&1)" apt_get_update_output="$(apt-get -q update 2>&1)"
apt_get_upgrade_output="$(LANG="C" apt-get -s upgrade 2>&1)"
exit_code="$?" exit_code="$?"
echo "$apt_get_output" | awk "/^Inst/{ print $2 }" | [ "$(wc -L)" -eq 0 ] && echo "true" || echo "false" echo "$apt_get_upgrade_output" | awk "/^Inst/{ print $2 }" | [ "$(wc -L)" -eq 0 ] && echo "true" || echo "false"
else else
echo "Check not implemented for this distribution" >&2 echo "Check not implemented for this distribution" >&2
exit 1 exit 1

1
vm-systemd/qubes-update-check.service
View File

@ -5,5 +5,4 @@ After=qubes-qrexec-agent.service
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=/bin/sh -c 'if [ -e /etc/debian_version ]; then apt-get -q update; fi'
ExecStart=/usr/lib/qubes/upgrades-status-notify ExecStart=/usr/lib/qubes/upgrades-status-notify