diff --git a/buildUpgradePackages.sh b/buildUpgradePackages.sh
index a7536d9..d48e4ec 100755
--- a/buildUpgradePackages.sh
+++ b/buildUpgradePackages.sh
@@ -9,14 +9,15 @@ fi
 
 for atom in $(emerge -uDN --pretend --quiet world | grep ^'\[ebuild' | sed -e 's/.* \b\([a-z0-9\-]\+\/[\_A-Za-z\.0-9\-]\+\)\b.*/\1/g');
 do
-  if [[ ! -f "$PKGDIR/$atom.tbz2" ]]
+  PACKAGE_FILE="$PKGDIR/$atom.tbz2"
+  if [[ ! -f "$PACKAGE_FILE"  ]]
   then
     #build one by one. This takes more time, however it builds all possible packages.
 #    echo "building $atom "
     emerge --quiet --keep-going -B "=${atom}" &> /dev/null
-    if [[ $? ]]
+    if [[ -f "$PACKAGE_FILE" ]]
     then
-      SUCCESS="$atom $SUCCESS"
+      SUCCESS="$SUCCESS $atom"
     else
       FAILURE="$atom $FAILURE"
     fi