diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-04-05 21:20:57 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-04-05 21:20:57 +0000 |
| commit | 6c193ece694dc93eb6948f40a135457c9c85d0d6 (patch) | |
| tree | 79969ffec20d888ee44090b231c55372d871e98a /bin/etc-update | |
| parent | 62551a66cc82cfdc426fd533883674035622b4d6 (diff) | |
| download | portage-6c193ece694dc93eb6948f40a135457c9c85d0d6.tar.gz portage-6c193ece694dc93eb6948f40a135457c9c85d0d6.tar.bz2 portage-6c193ece694dc93eb6948f40a135457c9c85d0d6.zip | |
Don't set os.environ["USERLAND"] inside portage.data and rely on USERLAND from the profile instead (bail out if necessary when USERLAND is unset).
svn path=/main/trunk/; revision=6341
Diffstat (limited to 'bin/etc-update')
| -rwxr-xr-x | bin/etc-update | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/etc-update b/bin/etc-update index ab376b83c..bf1d0139b 100755 --- a/bin/etc-update +++ b/bin/etc-update @@ -386,7 +386,7 @@ Please select from the menu above (-1 to exit, losing this merge): " my_input=$(read_int) case ${my_input} in 1) echo "Replacing ${ofile} with ${mfile}" - if [[ ${USERLAND} == GNU ]]; then + if [[ ${USERLAND:-GNU} == GNU ]]; then chmod --reference="${ofile}" "${mfile}" else chmod $(stat -f %Mp%Lp "${ofile}") "${mfile}" |