Explorar o código

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

Michael Vogt %!s(int64=12) %!d(string=hai) anos
pai
achega
6074bc9ba4
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  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
   sysvinit
 1 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 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: 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
 	# ensure that really nothing happens
 	testfailure aptget install systemd-sysv -y -t "$1" -o Debug::pkgPackageManager=1
 	testfailure aptget install systemd-sysv -y -t "$1" -o Debug::pkgPackageManager=1
 	testdpkginstalled 'sysvinit'
 	testdpkginstalled 'sysvinit'