X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=autopkgtest.git;a=blobdiff_plain;f=runner%2Fadt-run;h=310c39ae8f9aea32abd191c247c602873b874240;hp=91102366944022390d887441def76ba4936354b2;hb=bab1c3b3247f91d8048735cbf03d3df0d5701a2e;hpb=406a961e5781f9a5f53b6fd7bc63793da5225404

diff --git a/runner/adt-run b/runner/adt-run
index 9110236..310c39a 100755
--- a/runner/adt-run
+++ b/runner/adt-run
@@ -816,6 +816,14 @@ exec '''+shellquote_cmdl(cmdl)+' "$@"'+"\n"
 	if rc:
 		pstderr("\n" "warning: failed to restore"
 			" testbed apt cache, exit code %d" % rc)
+	what = 'aptconf-reset'
+	cmdl = ['rm','-f','/etc/apt/apt.conf.d/90autopkgtest',
+		'/etc/apt/sources.list.d/autopkgtest.list',
+		'/etc/apt/preferences.d/90autopkgtest']
+	rc = tb.execute(what, cmdl, kind='install')
+	if rc:
+		pstderr("\n" "warning: failed to reset changes"
+			" made to testbed apt configuration, exit code %d" % rc)
 	tb._need_reset_apt = False
  def close(tb):
 	tb._debug('close, scratch=%s' % tb.scratch)