diff --git a/build-ubunturepo b/build-ubunturepo
index 44eee4fb3..375c0066b 100755
--- a/build-ubunturepo
+++ b/build-ubunturepo
@@ -172,7 +172,7 @@ then
     for file in `echo $packages`
     do
         file_low=`echo $file | tr '[A-Z]' '[a-z]'`
-        if grep -q $file $svn_up_log || [ "$BUILDALL" == 1 ]; then
+        if grep -q $file $svn_up_log || [ "$BUILDALL" == 1 -o "$file" = "perl-xCAT" ]; then
             rm -f ../../debs/${file_low}_*.deb
             #only for genesis package
             rm -f ../../debs/${file_low}-amd64_*.deb
@@ -260,7 +260,7 @@ __EOF__
     fi
 
     # Decide whether to upload or not
-    if [ "$UP" != 1 ]; then
+    if [ -n "$UP" ] && [ "$UP" == 0 ]; then
         echo "No need to upload"
         cd $old_pwd
         exit 0
@@ -351,7 +351,7 @@ __EOF__
     chgrp xcat $dep_tar_name
     chmod g+w $dep_tar_name
 
-    if [ "$UP" != 1 ];then
+    if [ -n "$UP" ] && [ "$UP" == 0 ];then
         echo "No need to upload the dep packages"
         cd $old_pwd
         exit 0