diff options
| author | Julian Andres Klode <jak@debian.org> | 2018-05-16 11:46:23 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2018-05-16 11:46:23 +0000 |
| commit | 622439b7bd2390f709b43701f4b55a172a434b43 (patch) | |
| tree | 4511447c0348a0f3d219c562c2e89dabb61cb403 /test/integration/test-disappearing-packages | |
| parent | b0283a5aeee428c9f2567b81ae78c9da68f6f4af (diff) | |
| parent | 8cc38267809a15ec9819bce721e52fcd90a523b9 (diff) | |
Merge branch 'pu/gitlab-ci' into 'master'
Pu/gitlab ci
See merge request apt-team/apt!17
Diffstat (limited to 'test/integration/test-disappearing-packages')
| -rwxr-xr-x | test/integration/test-disappearing-packages | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/test-disappearing-packages b/test/integration/test-disappearing-packages index e8748e6bc..b27755361 100755 --- a/test/integration/test-disappearing-packages +++ b/test/integration/test-disappearing-packages @@ -60,7 +60,7 @@ all files have been overwritten by other packages: Note: This is done automatically and on purpose by dpkg.' tail -n 4 disappear.output sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' -e "s#:$(getarchitecture 'native') #:native #" -if [ -n "$SUDO_USER" ]; then +if [ -n "$SUDO_USER" -a "$(id -u "$SUDO_USER")" -gt 0 ]; then testfileequal 'rootdir/var/log/apt/history.log' " Requested-By: $SUDO_USER ($(id -u "$SUDO_USER")) Install: old-pkg:native (1) |