~ubuntu-branches/ubuntu/quantal/friendly-recovery/quantal

Tags: 0.2.4

* usr/share/recovery-mode/options/dpkg:
- support python2.6 in dpkg recovery too (thanks to
Jοhan Kiviniemi)

added added

removed removed

# check and use dist-upgraders partial mode if we have it,

# it contains a lot of useful repair code

for p in /usr/lib/python2.5/site-packages/DistUpgrade/dist-upgrade.py \

/usr/lib/python2.6/site-packages/DistUpgrade/dist-upgrade.py; do

if [ -e $p ]; then

python $p --partial --frontend DistUpgradeViewText --datadir /usr/share/update-manager/

break

for v in 2.5 2.6; do

python="/usr/bin/python$v"

script="/usr/lib/python$v/site-packages/DistUpgrade/dist-upgrade.py"

if [ -x "$python" ] && [ -e "$script" ]; then

"$python" "$script" --partial --frontend DistUpgradeViewText \

--datadir /usr/share/update-manager/

break

done

# now run the apt foo again (if u-m was ok that shouldn't be needed