瀏覽代碼

Merge remote-tracking branch 'mvo/debian/sid' into debian/sid

Michael Vogt 12 年之前
父節點
當前提交
6074bc9ba4
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      test/integration/test-essential-force-loopbreak

+ 1 - 1
test/integration/test-essential-force-loopbreak

@@ -35,7 +35,7 @@ The following packages will be upgraded:
   sysvinit
 1 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 E: This installation run will require temporarily removing the essential package sysvinit:$(getarchitecture 'native') due to a Conflicts/Pre-Depends loop. This is often bad, but if you really want to do it, activate the APT::Force-LoopBreak option.
-E: Internal Error, Could not early remove sysvinit:amd64 (2)" aptget install systemd-sysv -t "$1" -s
+E: Internal Error, Could not early remove sysvinit:$(dpkg --print-architecture) (2)" aptget install systemd-sysv -t "$1" -s
 	# ensure that really nothing happens
 	testfailure aptget install systemd-sysv -y -t "$1" -o Debug::pkgPackageManager=1
 	testdpkginstalled 'sysvinit'