canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+455879@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:pull-package-config-amend into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/455879
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:pull-package-config-amend into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-cloud-worker/units/pull-package-configs.service b/charms/focal/autopkgtest-cloud-worker/units/pull-package-configs.service
index ba15be6..81d6f41 100644
--- a/charms/focal/autopkgtest-cloud-worker/units/pull-package-configs.service
+++ b/charms/focal/autopkgtest-cloud-worker/units/pull-package-configs.service
@@ -6,4 +6,4 @@ Type=oneshot
 User=ubuntu
 Group=ubuntu
 WorkingDirectory=/home/ubuntu/autopkgtest-package-configs/
-ExecStart=/usr/bin/git pull
+ExecStart=/usr/bin/git pull 2&>/dev/null || /usr/bin/printf "Local changes to %s, not pulling.\n" "$(pwd)"