Skip to content
Commits on Source (11)
Show whitespace changes
Inline Side-by-side
conf/distros.conf
View file @ d33ef39b
......@@ -54,31 +54,25 @@ depends = squeeze squeeze-backports
target-release = squeeze-backports-sloppy
[wheezy]
uri = http://archive.debian.org/debian
[wheezy/updates]
uri = http://security.debian.org
depends = wheezy
[wheezy-updates]
depends = wheezy
[wheezy-proposed-updates]
depends = wheezy
[wheezy-proposed]
uri = None
depends = wheezy wheezy/updates wheezy-updates wheezy-proposed-updates
candidates = wheezy wheezy/updates wheezy-proposed-updates
[wheezy-lts]
uri = None
depends = wheezy wheezy/updates
candidates = wheezy wheezy/updates
[wheezy-backports]
uri = http://archive.debian.org/debian
depends = wheezy wheezy/updates
target-release = wheezy-backports
[wheezy-backports-sloppy]
uri = http://archive.debian.org/debian
depends = wheezy wheezy-backports
target-release = wheezy-backports-sloppy
......@@ -87,26 +81,21 @@ target-release = wheezy-backports-sloppy
uri = http://security.debian.org
depends = jessie
[jessie-updates]
depends = jessie
[jessie-proposed-updates]
depends = jessie
[jessie-proposed]
uri = None
depends = jessie jessie/updates jessie-updates jessie-proposed-updates
candidates = jessie jessie/updates jessie-proposed-updates
[jessie-lts]
uri = None
depends = jessie jessie/updates
candidates = jessie jessie/updates
[jessie-backports]
uri = http://archive.debian.org/debian
depends = jessie jessie/updates
target-release = jessie-backports
[jessie-backports-sloppy]
uri = http://archive.debian.org/debian
depends = jessie jessie/updates jessie-backports
target-release = jessie-backports-sloppy
[stretch/updates]
uri = http://security.debian.org
......@@ -131,6 +120,10 @@ candidates = stretch stretch/updates stretch-proposed-updates
depends = stretch stretch/updates
target-release = stretch-backports
[stretch-backports-sloppy]
depends = stretch stretch/updates stretch-backports
target-release = stretch-backports-sloppy
[buster/updates]
uri = http://security.debian.org
......@@ -151,6 +144,18 @@ uri = None
depends = buster buster/updates buster-updates buster-proposed-updates
candidates = buster buster/updates buster-proposed-updates
[buster-backports]
depends = buster buster/updates
target-release = buster-backports
[buster-backports-sloppy]
depends = buster buster/updates buster-backports
target-release = buster-backports-sloppy
[bullseye-proposed-updates]
depends = bullseye
[sid-debug]
uri = http://deb.debian.org/debian-debug
......
custom-scripts/scripts-wheezy/pre_distupgrade_wheezy
View file @ d33ef39b
......@@ -10,8 +10,7 @@ log_debug() {
FORCEREMOVE=
if [ "$PIUPARTS_DISTRIBUTION_NEXT" = "wheezy" ] || \
[ "$PIUPARTS_DISTRIBUTION_NEXT" = "wheezy-proposed" ]
if [ "$PIUPARTS_DISTRIBUTION_NEXT" = "wheezy" ]
then
case ${PIUPARTS_OBJECTS%%=*} in
......
custom-scripts/scripts/post_distupgrade_base_cleanup
View file @ d33ef39b
......@@ -44,8 +44,7 @@ mark_for_purge()
}
if [ "$PIUPARTS_DISTRIBUTION" = "wheezy" ] || \
[ "$PIUPARTS_DISTRIBUTION" = "wheezy-proposed" ] ; then
if [ "$PIUPARTS_DISTRIBUTION" = "wheezy" ] ; then
mark_for_purge libdb4.8
......@@ -55,8 +54,7 @@ if [ "$PIUPARTS_DISTRIBUTION" = "wheezy" ] || \
fi
if [ "$PIUPARTS_DISTRIBUTION" = "jessie" ] || \
[ "$PIUPARTS_DISTRIBUTION" = "jessie-proposed" ] ; then
if [ "$PIUPARTS_DISTRIBUTION" = "jessie" ] ; then
mark_for_purge libdb5.1
......
custom-scripts/scripts/post_distupgrade_exceptions
View file @ d33ef39b
......@@ -82,7 +82,8 @@ if [ "$PIUPARTS_DISTRIBUTION" = "stretch" ]; then
fi
if [ "$PIUPARTS_DISTRIBUTION" = "buster" ]; then
if [ "$PIUPARTS_DISTRIBUTION" = "buster" ] || \
[ "$PIUPARTS_DISTRIBUTION" = "sid" -a "$PIUPARTS_DISTRIBUTION_PREV" = "stretch" ]; then
# libc-bin only upgrades pristine /etc/nsswitch.conf
if grep -q '^passwd:.*compat' /etc/nsswitch.conf ; then
......@@ -116,4 +117,10 @@ if [ "$PIUPARTS_DISTRIBUTION" = "buster" ]; then
chmod -c go-rx /var/lib/polkit-1
fi
#920760, wontfix, libpam-modules: does not ensure that pam-auth-update gets called after the package was configured
if ! grep -q mkhomedir /var/lib/pam/seen ; then
echo "Running pam-auth-update..."
pam-auth-update
fi
fi
custom-scripts/scripts/pre_install_database-server
View file @ d33ef39b
......@@ -194,7 +194,7 @@ esac
if [ "$FUSIONFORGE" = "yes" ]; then
case "$PIUPARTS_DISTRIBUTION" in
wheezy*|jessie|jessie/updates|jessie-updates|jessie-proposed-updates)
wheezy*|jessie|jessie/updates)
POSTGRESQL=yes
;;
*)
......
debian/changelog
View file @ d33ef39b
......@@ -10,6 +10,21 @@ piuparts (0.99) UNRELEASED; urgency=medium
It has a bug related to "upgrade test" sections, which cause a large
number of packages to incorrectly be reported in the "waiting" state.
[ Andreas Beckmann ]
* piuparts.py:
- Add '--distupgrade-to-testdebs-from DIR' as a shorthand for
'--bindmount DIR --testdebs-repo DIR --distupgrade-to-testdebs'.
* distros.conf:
- wheezy* has been archived/removed.
- jessie* has been partially archived/removed.
- Add buster-backports.
- Add bullseye-proposed-updates.
* scripts/post_distupgrade_exceptions:
- Handle /var/lib/pam/seen stretch -> buster upgrade by running
pam-auth-update if needed. Workaround for #920760.
* master-bin/reschedule_piuparts_tests: Do not act on 'bugged/*.log' and
'affected/*.log' by default. Add --bugged, --affected flags.
-- Holger Levsen <holger@debian.org> Fri, 01 Mar 2019 11:47:19 +0100
piuparts (0.98) unstable; urgency=medium
......
instances/piuparts.conf-template.pejacevic
View file @ d33ef39b
......@@ -196,7 +196,6 @@ sections =
jessie
jessie-rcmd
jessie-security
# jessie-pu
wheezy2jessie-lts
wheezy2jessie
wheezy2jessie-rcmd
......@@ -205,7 +204,6 @@ sections =
wheezy2lts
wheezy
wheezy-security
# wheezy-pu
squeeze2wheezy-lts
squeeze2wheezy
squeeze2bpo-sloppy
......@@ -756,17 +754,6 @@ depends-sections = jessie
distro = jessie/updates
[jessie-pu]
precedence = 5
json-sections = none
piuparts-flags =
%(flags-default)s
%(flags-start-jessie)s
%(flags-end-jessie)s
depends-sections = jessie
distro = jessie-proposed-updates
[jessie-lts]
precedence = 5
json-sections = none
......@@ -870,18 +857,6 @@ distro = wheezy/updates
reschedule-old-count = 0
[wheezy-pu]
precedence = 100
json-sections = none
piuparts-flags =
%(flags-default)s
%(flags-start-wheezy)s
%(flags-end-wheezy)s
depends-sections = wheezy
distro = wheezy-proposed-updates
reschedule-old-count = 0
[wheezy2lts]
precedence = 100
json-sections = none
......
instances/piuparts.conf.anbe
View file @ d33ef39b
......@@ -142,7 +142,7 @@ sections =
buster-debug/main
stretch/main
stretch-rcmd/main
stretch-proposed/main
stretch-next/main
stretch-security/main
stretch-updates/main
stretch-pu/main
......@@ -157,7 +157,7 @@ sections =
testing2sid/main
stable2sid/main
stable2testing2sid/main
stretch2proposed/main
stretch2next/main
stretch2buster/main
stretch3buster/main
stretch2buster_i386/main
......@@ -206,7 +206,7 @@ sections =
buster-debug/contrib
stretch/contrib
stretch-rcmd/contrib
stretch-proposed/contrib
stretch-next/contrib
stretch-security/contrib
stretch-updates/contrib
stretch-pu/contrib
......@@ -221,7 +221,7 @@ sections =
testing2sid/contrib
stable2sid/contrib
stable2testing2sid/contrib
stretch2proposed/contrib
stretch2next/contrib
stretch2buster/contrib
stretch3buster/contrib
stretch2buster_i386/contrib
......@@ -270,7 +270,7 @@ sections =
buster-debug/non-free
stretch/non-free
stretch-rcmd/non-free
stretch-proposed/non-free
stretch-next/non-free
stretch-security/non-free
stretch-updates/non-free
stretch-pu/non-free
......@@ -285,7 +285,7 @@ sections =
testing2sid/non-free
stable2sid/non-free
stable2testing2sid/non-free
stretch2proposed/non-free
stretch2next/non-free
stretch2buster/non-free
stretch3buster/non-free
stretch2buster_i386/non-free
......@@ -1365,7 +1365,7 @@ arch = amd64
area = non-free
[stretch-proposed/main]
[stretch-next/main]
precedence = 20
piuparts-flags =
%(flags-default)s
......@@ -1378,25 +1378,25 @@ components = main
reschedule-old-count = 500
reschedule-old-days = 25
[stretch-proposed/contrib]
[stretch-next/contrib]
precedence = 45
piuparts-flags =
%(flags-default)s
%(flags-start-stretch)s
%(flags-end-stretch)s
depends-sections = stretch-proposed/main stretch-proposed/non-free
depends-sections = stretch-next/main stretch-next/non-free
distro = stretch-proposed
arch = amd64
area = contrib
reschedule-old-days = 25
[stretch-proposed/non-free]
[stretch-next/non-free]
precedence = 45
piuparts-flags =
%(flags-default)s
%(flags-start-stretch)s
%(flags-end-stretch)s
depends-sections = stretch-proposed/main stretch-proposed/contrib
depends-sections = stretch-next/main stretch-next/contrib
distro = stretch-proposed
arch = amd64
area = non-free
......@@ -2327,7 +2327,7 @@ arch = i386
setarch = linux32
area = main
components = main
upgrade-test-distros = squeeze squeeze-lts wheezy
upgrade-test-distros = squeeze squeeze-lts wheezy-lts
reschedule-old-count = 0
[squeeze2lts2wheezy/contrib]
......@@ -2342,7 +2342,7 @@ distro = squeeze-lts
arch = i386
setarch = linux32
area = contrib
upgrade-test-distros = squeeze squeeze-lts wheezy
upgrade-test-distros = squeeze squeeze-lts wheezy-lts
reschedule-old-count = 0
[squeeze2lts2wheezy/non-free]
......@@ -2357,7 +2357,7 @@ distro = squeeze-lts
arch = i386
setarch = linux32
area = non-free
upgrade-test-distros = squeeze squeeze-lts wheezy
upgrade-test-distros = squeeze squeeze-lts wheezy-lts
reschedule-old-count = 0
......@@ -3255,8 +3255,8 @@ piuparts-flags =
arch = amd64
area = main
components = main
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
[jessie2stretch/contrib]
precedence = 95
......@@ -3268,8 +3268,8 @@ piuparts-flags =
depends-sections = jessie2stretch/main jessie2stretch/non-free
arch = amd64
area = contrib
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
[jessie2stretch/non-free]
precedence = 95
......@@ -3281,8 +3281,8 @@ piuparts-flags =
depends-sections = jessie2stretch/main jessie2stretch/contrib
arch = amd64
area = non-free
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
[jessie3stretch/main]
......@@ -3297,8 +3297,8 @@ piuparts-flags =
arch = amd64
area = main
components = main
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
[jessie3stretch/contrib]
......@@ -3313,8 +3313,8 @@ piuparts-flags =
depends-sections = jessie3stretch/main jessie3stretch/non-free
arch = amd64
area = contrib
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
[jessie3stretch/non-free]
......@@ -3329,8 +3329,8 @@ piuparts-flags =
depends-sections = jessie3stretch/main jessie3stretch/contrib
arch = amd64
area = non-free
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
......@@ -3345,8 +3345,8 @@ arch = i386
setarch = linux32
area = main
components = main
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
[jessie2stretch_i386/contrib]
precedence = 95
......@@ -3359,8 +3359,8 @@ depends-sections = jessie2stretch_i386/main jessie2stretch_i386/non-free
arch = i386
setarch = linux32
area = contrib
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
[jessie2stretch_i386/non-free]
precedence = 95
......@@ -3373,8 +3373,8 @@ depends-sections = jessie2stretch_i386/main jessie2stretch_i386/contrib
arch = i386
setarch = linux32
area = non-free
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
[jessie3stretch_i386/main]
......@@ -3390,8 +3390,8 @@ arch = i386
setarch = linux32
area = main
components = main
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
[jessie3stretch_i386/contrib]
......@@ -3407,8 +3407,8 @@ depends-sections = jessie3stretch_i386/main jessie3stretch_i386/non-free
arch = i386
setarch = linux32
area = contrib
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
[jessie3stretch_i386/non-free]
......@@ -3424,8 +3424,8 @@ depends-sections = jessie3stretch_i386/main jessie3stretch_i386/contrib
arch = i386
setarch = linux32
area = non-free
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
......@@ -3441,8 +3441,8 @@ piuparts-flags =
arch = amd64
area = main
components = main
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
[jessie2stretch-rcmd/contrib]
precedence = 95
......@@ -3456,8 +3456,8 @@ piuparts-flags =
depends-sections = jessie2stretch-rcmd/main jessie2stretch-rcmd/non-free
arch = amd64
area = contrib
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
[jessie2stretch-rcmd/non-free]
precedence = 95
......@@ -3471,8 +3471,8 @@ piuparts-flags =
depends-sections = jessie2stretch-rcmd/main jessie2stretch-rcmd/contrib
arch = amd64
area = non-free
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
[jessie3stretch-rcmd/main]
......@@ -3488,8 +3488,8 @@ piuparts-flags =
arch = amd64
area = main
components = main
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
[jessie3stretch-rcmd/contrib]
......@@ -3505,8 +3505,8 @@ piuparts-flags =
depends-sections = jessie3stretch-rcmd/main jessie3stretch-rcmd/non-free
arch = amd64
area = contrib
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
[jessie3stretch-rcmd/non-free]
......@@ -3522,8 +3522,8 @@ piuparts-flags =
depends-sections = jessie3stretch-rcmd/main jessie3stretch-rcmd/contrib
arch = amd64
area = non-free
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
......@@ -3540,8 +3540,8 @@ arch = i386
setarch = linux32
area = main
components = main
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
[jessie2stretch-rcmd_i386/contrib]
precedence = 95
......@@ -3556,8 +3556,8 @@ depends-sections = jessie2stretch-rcmd_i386/main jessie2stretch-rcmd_i386/non-fr
arch = i386
setarch = linux32
area = contrib
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
[jessie2stretch-rcmd_i386/non-free]
precedence = 95
......@@ -3572,8 +3572,8 @@ depends-sections = jessie2stretch-rcmd_i386/main jessie2stretch-rcmd_i386/contri
arch = i386
setarch = linux32
area = non-free
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
[jessie3stretch-rcmd_i386/main]
......@@ -3590,8 +3590,8 @@ arch = i386
setarch = linux32
area = main
components = main
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
[jessie3stretch-rcmd_i386/contrib]
......@@ -3608,8 +3608,8 @@ depends-sections = jessie3stretch-rcmd_i386/main jessie3stretch-rcmd_i386/non-fr
arch = i386
setarch = linux32
area = contrib
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
[jessie3stretch-rcmd_i386/non-free]
......@@ -3626,8 +3626,8 @@ depends-sections = jessie3stretch-rcmd_i386/main jessie3stretch-rcmd_i386/contri
arch = i386
setarch = linux32
area = non-free
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
......@@ -3643,8 +3643,8 @@ piuparts-flags =
arch = amd64
area = main
components = main
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
[jessie2stretch-iri/contrib]
precedence = 95
......@@ -3658,8 +3658,8 @@ piuparts-flags =
depends-sections = jessie2stretch-iri/main jessie2stretch-iri/non-free
arch = amd64
area = contrib
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
[jessie2stretch-iri/non-free]
precedence = 95
......@@ -3673,8 +3673,8 @@ piuparts-flags =
depends-sections = jessie2stretch-iri/main jessie2stretch-iri/contrib
arch = amd64
area = non-free
distro = jessie
upgrade-test-distros = jessie stretch
distro = jessie-lts
upgrade-test-distros = jessie-lts stretch
[jessie2bpo2stretch/main]
......@@ -3688,7 +3688,7 @@ distro = jessie-backports
arch = amd64
area = main
components = main
upgrade-test-distros = jessie jessie-backports stretch
upgrade-test-distros = jessie-lts jessie-backports stretch
[jessie2bpo2stretch/contrib]
precedence = 95
......@@ -3700,7 +3700,7 @@ depends-sections = jessie/main jessie/contrib jessie/non-free jessie2bpo2stretch
distro = jessie-backports
arch = amd64
area = contrib
upgrade-test-distros = jessie jessie-backports stretch
upgrade-test-distros = jessie-lts jessie-backports stretch
[jessie2bpo2stretch/non-free]
precedence = 95
......@@ -3712,7 +3712,7 @@ depends-sections = jessie/main jessie/contrib jessie/non-free jessie2bpo2stretch
distro = jessie-backports
arch = amd64
area = non-free
upgrade-test-distros = jessie jessie-backports stretch
upgrade-test-distros = jessie-lts jessie-backports stretch
[jessie222testing/main]
......@@ -3804,7 +3804,7 @@ upgrade-test-distros = jessie stretch testing
reschedule-old-count = 100
[stretch2proposed/main]
[stretch2next/main]
precedence = 60
piuparts-flags =
%(flags-default)s
......@@ -3817,25 +3817,25 @@ components = main
distro = stretch
upgrade-test-distros = stretch stretch-proposed
[stretch2proposed/contrib]
[stretch2next/contrib]
precedence = 95
piuparts-flags =
%(flags-default)s
%(flags-start-stretch)s
%(flags-end-stretch)s
depends-sections = stretch2proposed/main stretch2proposed/non-free
depends-sections = stretch2next/main stretch2next/non-free
arch = amd64
area = contrib
distro = stretch
upgrade-test-distros = stretch stretch-proposed
[stretch2proposed/non-free]
[stretch2next/non-free]
precedence = 95
piuparts-flags =
%(flags-default)s
%(flags-start-stretch)s
%(flags-end-stretch)s
depends-sections = stretch2proposed/main stretch2proposed/contrib
depends-sections = stretch2next/main stretch2next/contrib
arch = amd64
area = non-free
distro = stretch
......
master-bin/reschedule_piuparts_tests.in
View file @ d33ef39b
......@@ -27,7 +27,12 @@ get_config_value TESTING global testing-suite
dryrun=""
current=""
longterm=""
pass=""
fail="fail"
bugged=""
affected=""
untestable="untestable"
for arg in "$@"
do
......@@ -36,6 +41,15 @@ do
shift
pass="pass"
;;
--affected)
shift
affected="affected"
;;
--bugged)
shift
bugged="bugged"
affected="affected"
;;
--current)
shift
current="yes"
......@@ -56,7 +70,7 @@ done
test -n "$1" || exit 1
subdirs="$pass fail bugged affected"
subdirs="$pass $fail $bugged $affected $untestable"
pattern=' ('"$1"')\.conf$'
......
piuparts.py
View file @ d33ef39b
......@@ -2716,6 +2716,9 @@ def parse_command_line():
action='store_true',
help="Use the testdebs repository as distupgrade target.")
parser.add_option("--distupgrade-to-testdebs-from", metavar="DIR",
help="Shorthand for --bindmount DIR --testdebs-repo DIR --distupgrade-to-testdebs.")
parser.add_option("-e", "--existing-chroot", metavar="DIR",
help="Use DIR as the contents of the initial " +
"chroot, instead of building a new one with " +
......@@ -2963,6 +2966,12 @@ def parse_command_line():
(opts, args) = parser.parse_args()
# expand combined options
if opts.distupgrade_to_testdebs_from:
opts.bindmount.append(opts.distupgrade_to_testdebs_from)
opts.testdebs_repo = opts.distupgrade_to_testdebs_from
opts.distupgrade_to_testdebs = True
settings.defaults = opts.defaults
defaults = DefaultsFactory().new_defaults()
......