|
Lines 64-70
Link Here
|
| 64 |
env-update |
64 |
env-update |
| 65 |
echo "Rebuilding: $MODULE, pass ${x}" |
65 |
echo "Rebuilding: $MODULE, pass ${x}" |
| 66 |
echo "Rebuilding: $MODULE, pass ${x}" >> $LOG |
66 |
echo "Rebuilding: $MODULE, pass ${x}" >> $LOG |
| 67 |
if ! emerge "$MODULE"; then |
67 |
if ! emerge --oneshot "$MODULE"; then |
| 68 |
echo "emerge $MODULE FAILED while in rebuild, pass ${x}." |
68 |
echo "emerge $MODULE FAILED while in rebuild, pass ${x}." |
| 69 |
echo "emerge $MODULE FAILED while in rebuild, pass ${x}." >> $LOG |
69 |
echo "emerge $MODULE FAILED while in rebuild, pass ${x}." >> $LOG |
| 70 |
|
70 |
|
|
Lines 211-242
Link Here
|
| 211 |
# |
211 |
# |
| 212 |
#echo "Restoring world file..." |
212 |
#echo "Restoring world file..." |
| 213 |
#mv /var/cache/edb/world.update_system_backup /var/cache/edb/world |
213 |
#mv /var/cache/edb/world.update_system_backup /var/cache/edb/world |
| 214 |
|
214 |
# |
| 215 |
REBUILD_LIST=` |
215 |
#REBUILD_LIST=` |
| 216 |
echo $LDD_LIST | sed 's:\([^ ]\+\):\\>\\=\1:g' | xargs emerge -np $(cat /var/cache/edb/world) | |
216 |
# echo $LDD_LIST | sed 's:\([^ ]\+\):\\>\\=\1:g' | xargs emerge -np $(cat /var/cache/edb/world) | |
| 217 |
grep ebuild | sed 's:.*\] \([^ ]\+\) .*:\1:'` |
217 |
# grep ebuild | sed 's:.*\] \([^ ]\+\) .*:\1:'` |
| 218 |
|
218 |
# |
| 219 |
if echo $REBUILD_LIST | egrep -q "no.*ebuilds to satisfy"; then |
219 |
#if echo $REBUILD_LIST | egrep -q "no.*ebuilds to satisfy"; then |
| 220 |
echo "Packages are installed that no longer exist in Gentoo." |
220 |
# echo "Packages are installed that no longer exist in Gentoo." |
| 221 |
echo "Determine what you need to do to fix this and try again." |
221 |
# echo "Determine what you need to do to fix this and try again." |
| 222 |
echo "The package may have been moved to a different category." |
222 |
# echo "The package may have been moved to a different category." |
| 223 |
echo |
223 |
# echo |
| 224 |
echo "Easiest course of action: unmerge these by explicit versions" |
224 |
# echo "Easiest course of action: unmerge these by explicit versions" |
| 225 |
echo "and re-emerge them if they still exist." |
225 |
# echo "and re-emerge them if they still exist." |
| 226 |
echo 'emerge -C \=package-version' |
226 |
# echo 'emerge -C \=package-version' |
| 227 |
echo "Notice: $REBUILD_LIST" |
227 |
# echo "Notice: $REBUILD_LIST" |
| 228 |
exit 1 |
228 |
# exit 1 |
| 229 |
fi |
229 |
#fi |
| 230 |
|
230 |
# |
| 231 |
if echo $REBUILD_LIST | grep -q "have been masked"; then |
231 |
#if echo $REBUILD_LIST | grep -q "have been masked"; then |
| 232 |
echo "Masked packages are installed and need to be rebuilt..." |
232 |
# echo "Masked packages are installed and need to be rebuilt..." |
| 233 |
echo "Either unmask them, or emerge -C them all." |
233 |
# echo "Either unmask them, or emerge -C them all." |
| 234 |
echo |
234 |
# echo |
| 235 |
echo "Easiest course of action: check your ACCEPT_KEYWORDS in make.conf" |
235 |
# echo "Easiest course of action: check your ACCEPT_KEYWORDS in make.conf" |
| 236 |
echo 'emerge -C \=package-version' |
236 |
# echo 'emerge -C \=package-version' |
| 237 |
echo "Notice: $REBUILD_LIST" |
237 |
# echo "Notice: $REBUILD_LIST" |
| 238 |
exit 1 |
238 |
# exit 1 |
| 239 |
fi |
239 |
#fi |
| 240 |
|
240 |
|
| 241 |
#Join the perl module list and the binary list, sorting out dups |
241 |
#Join the perl module list and the binary list, sorting out dups |
| 242 |
FULL_LIST=`echo ${REBUILD_LIST} ${MODULE_LIST} | sort -u` |
242 |
FULL_LIST=`echo ${REBUILD_LIST} ${MODULE_LIST} | sort -u` |
