diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:08:54 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:08:54 +0200 |
| commit | 3444603f5ff2b4c4816e45e686e06e01df31cdc4 (patch) | |
| tree | b0e63e9bc86ca6d39f6987381ca7bfa64e186048 /test/integration/test-apt-cdrom | |
| parent | 52d5690b47bd4efe425fa23d9f6559bb44324cd1 (diff) | |
| parent | 3278fe66567d149ea92c1afa78941f2bc3c71c85 (diff) | |
merged debian-sid branch and resolved conflicts
Diffstat (limited to 'test/integration/test-apt-cdrom')
| -rwxr-xr-x | test/integration/test-apt-cdrom | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom index f24c99b36..f1c4fd9d3 100755 --- a/test/integration/test-apt-cdrom +++ b/test/integration/test-apt-cdrom @@ -24,6 +24,8 @@ cat Translation-de | xz --format=lzma > Translation-de.lzma cat Translation-de | xz > Translation-de.xz rm Translation-en Translation-de cd - > /dev/null +addtrap "chmod -R +w $PWD/rootdir/media/cdrom/dists/;" +chmod -R -w rootdir/media/cdrom/dists aptcdrom add -m -o quiet=1 > apt-cdrom.log 2>&1 sed -i -e '/^Using CD-ROM/ d' -e '/gpgv/ d' -e '/^Identifying/ d' -e '/Reading / d' apt-cdrom.log |