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

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

  Fixes QubesOS/qubes-issues#1889

misc/upgrades-installed-check

@@ -17,9 +17,10 @@ elif [ -e /etc/debian_version ]; then
    ## Debian
    set -e
    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="$?"
-   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
    echo "Check not implemented for this distribution" >&2
    exit 1

vm-systemd/qubes-update-check.service

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