Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 347897
Collapse All | Expand All

(-)python-updater (-6 / +7 lines)
Lines 41-48 PYTHON3_VERSIONS="3.0 3.1 3.2 3.3" Link Here
41
PYTHON_VERSIONS="${PYTHON2_VERSIONS} ${PYTHON3_VERSIONS}"
41
PYTHON_VERSIONS="${PYTHON2_VERSIONS} ${PYTHON3_VERSIONS}"
42
42
43
SUPPORTED_PMS="portage pkgcore paludis"
43
SUPPORTED_PMS="portage pkgcore paludis"
44
PMS_COMMAND=( "emerge" "pmerge" "paludis" )
44
PMS_COMMAND=( "emerge" "pmerge" "cave" )
45
PMS_OPTIONS=( "-Dv1 --keep-going" "-Do" "-i1" )
45
PMS_OPTIONS=( "-Dv1 --keep-going" "-Do" "resolve --preserve-world --lazy --continue-on-failure if-independent --execute" )
46
PMS_PRETEND_OPTIONS=( "-p" "-p" "--no-execute" )
46
PMS_INDEX=0
47
PMS_INDEX=0
47
CUSTOM_PMS_COMMAND=""
48
CUSTOM_PMS_COMMAND=""
48
ADDITIONAL_OPTIONS=""
49
ADDITIONAL_OPTIONS=""
Lines 134-140 has_version() { Link Here
134
    elif [[ "${PMS_COMMAND[${PMS_INDEX}]}" == "pmerge" ]]; then
135
    elif [[ "${PMS_COMMAND[${PMS_INDEX}]}" == "pmerge" ]]; then
135
        pquery --vdb "${1}"
136
        pquery --vdb "${1}"
136
    else
137
    else
137
        paludis --has-version "${1}"
138
        cave has-version "${1}"
138
    fi
139
    fi
139
}
140
}
140
141
Lines 170-176 get_USE_PYTHON() { Link Here
170
            USE_PYTHON="$(/usr/bin/portageq envvar USE_PYTHON)"
171
            USE_PYTHON="$(/usr/bin/portageq envvar USE_PYTHON)"
171
        fi
172
        fi
172
    else
173
    else
173
        USE_PYTHON="$(paludis --environment-variable "${1}/${2}${3:+:}${3}::/?" USE_PYTHON)"
174
        USE_PTYHON="$(cave print-id-environment-variable --best "${1}/${2}${3:+:}${3}::/?" --variable-name USE_PYTHON --format '%v\n')"
174
    fi
175
    fi
175
    if [[ -z "${USE_PYTHON}" ]]; then
176
    if [[ -z "${USE_PYTHON}" ]]; then
176
        USE_PYTHON="${NEW_PYTHON2_VERSION} ${NEW_PYTHON3_VERSION}"
177
        USE_PYTHON="${NEW_PYTHON2_VERSION} ${NEW_PYTHON3_VERSION}"
Lines 211-217 get_RESTRICT_PYTHON_ABIS() { Link Here
211
            grep "^RESTRICT_PYTHON_ABIS=" "${ebuild_path}" | sed -e "s/RESTRICT_PYTHON_ABIS=[\"']\(.*\)[\"']/\1/"
212
            grep "^RESTRICT_PYTHON_ABIS=" "${ebuild_path}" | sed -e "s/RESTRICT_PYTHON_ABIS=[\"']\(.*\)[\"']/\1/"
212
        fi
213
        fi
213
    else
214
    else
214
        paludis --environment-variable "${1}/${2}${3:+:}${3}::/?" RESTRICT_PYTHON_ABIS
215
        cave print-id-environment-variable --best "${1}/${2}${3:+:}${3}::/?" --variable-name RESTRICT_PYTHON_ABIS --format '%v\n'
215
    fi
216
    fi
216
}
217
}
217
218
Lines 654-660 if [[ "${PMS_COMMAND[${PMS_INDEX}]}" == Link Here
654
fi
655
fi
655
656
656
# Only pretending?
657
# Only pretending?
657
[[ PRETEND -eq 1 ]] && PMS_OPTIONS[${PMS_INDEX}]="${PMS_OPTIONS[${PMS_INDEX}]} -p"
658
[[ PRETEND -eq 1 ]] && PMS_OPTIONS[${PMS_INDEX}]="${PMS_OPTIONS[${PMS_INDEX}]} ${PMS_PRETEND_OPTIONS[${PMS_INDEX}]}"
658
659
659
# (Pretend to) reinstall packages
660
# (Pretend to) reinstall packages
660
if [[ -n "${PKGS_TO_REMERGE}" ]]; then
661
if [[ -n "${PKGS_TO_REMERGE}" ]]; then

Return to bug 347897