View | Details | Raw Unified | Return to bug 51932 | Differences between
and this patch

Collapse All | Expand All

(-)a/test/ucs-test/tests/09_updater/10online (-3 / +4 lines)
 Lines 13-21   RETVAL=110 # Test fehlgeschlagen Link Here 
13
13
14
setup_apache "${repoprefix}"
14
setup_apache "${repoprefix}"
15
15
16
mkpdir "${_version_version}-0" maintained "${ARCH}"
16
mkpdir5 "ucs${major}${minor}0"
17
mkdeb "${pkgname}" 1 "${ARCH}" "${DIR}"
17
mkdeb "${pkgname}" 1 "${ARCH}" "${DIR}/${pkgname::1}"
18
mkpkg "${DIR}"
18
mkpkg5 "${DIR}" "${DIR}/../dists/ucs${major}${minor}0/main/binary-amd64"
19
tree "${DIR}/.."
19
20
20
config_repo repository/online=no
21
config_repo repository/online=no
21
22
(-)a/test/ucs-test/tests/09_updater/pool.sh (-1 / +38 lines)
 Lines 286-291   mkpdir () { # Create pool directory ${dir} Link Here 
286
	return 0
286
	return 0
287
}
287
}
288
288
289
mkpdir5 () {
290
	DIR="${REPODIR}/pool"
291
	mkdir -p "${DIR}"
292
	mkdir -p "${REPODIR}/dists/${1}"
293
	return 0
294
}
295
289
mkdeb () { # Create dummy package [name [version [arch [dir [postinst]]]]]
296
mkdeb () { # Create dummy package [name [version [arch [dir [postinst]]]]]
290
	local name="${1:-test}"
297
	local name="${1:-test}"
291
	local version="${2:-1}"
298
	local version="${2:-1}"
 Lines 310-315   mkdeb () { # Create dummy package [name [version [arch [dir [postinst]]]]] Link Here 
310
	chmod 755 "${BASEDIR}/${name}-${version}/DEBIAN/postinst"
317
	chmod 755 "${BASEDIR}/${name}-${version}/DEBIAN/postinst"
311
	DEB="${BASEDIR}/${name}_${version}_${arch}.deb"
318
	DEB="${BASEDIR}/${name}_${version}_${arch}.deb"
312
	dpkg-deb -b "${BASEDIR}/${name}-${version}" "${DEB}" >&3 2>&3
319
	dpkg-deb -b "${BASEDIR}/${name}-${version}" "${DEB}" >&3 2>&3
320
	mkdir -p "${dir}"
313
	[ -z "${dir}" ] || cp "${DEB}" "${dir}/"
321
	[ -z "${dir}" ] || cp "${DEB}" "${dir}/"
314
}
322
}
315
323
 Lines 374-379   mkpkg () { # Create Package files for ${1}. Optional arguments go to dpkg-scanpa Link Here 
374
	cd "${OLDPWD}" || return $?
382
	cd "${OLDPWD}" || return $?
375
}
383
}
376
384
385
mkpkg5 () { # Create Package files for ${1} and save them to ${2}. Optional arguments go to dpkg-scanpackages.
386
	local dir="${1:-${DIR}}"
387
	shift
388
	local version="${1:-500}"
389
	shift
390
	local arch="${1:-amd64}"
391
	shift
392
	local packagesdir="${1:-${dir}/../dists/ucs${version}/main/binary-${arch}}"
393
	shift
394
	mkdir -p "${packagesdir}"
395
	cd "${dir}/.." || return $?
396
	local subdir="${dir#${PWD}/}"
397
	dpkg-scanpackages "${@}" "${subdir}" > "${packagesdir}/Packages" 2>&3
398
	xz -k "${packagesdir}/Packages"
399
	cd "${OLDPWD}" || return $?
400
	mkgpg
401
	cd "${packagesdir}/../.." || return $?
402
	rm -f Release Release.tmp Release.gpg
403
	apt-ftparchive \
404
		-o "APT::FTPArchive::Release::Origin=Univention" \
405
		-o "APT::FTPArchive::Release::Label=Univention" \
406
		-o "APT::FTPArchive::Release::Version=${subdir%%/*}" \
407
		-o "APT::FTPArchive::Release::Codename=${subdir}" \
408
		release . >Release.tmp 2>&3
409
	mv Release.tmp Release
410
411
	gpgsign Release
412
	cd "${OLDPWD}" || return $?
413
}
414
377
gpgsign () { # sign file
415
gpgsign () { # sign file
378
	mkgpg
416
	mkgpg
379
	local out sign
417
	local out sign
380
- 

Return to bug 51932