diff --git a/xCAT/postscripts/ospkgs b/xCAT/postscripts/ospkgs index 5a36e7c01..87d687fd4 100755 --- a/xCAT/postscripts/ospkgs +++ b/xCAT/postscripts/ospkgs @@ -497,7 +497,7 @@ elif ( pmatch "$OSVER" "sles11*" ); then old_repo=`zypper lr |grep -e "^[0-9]" | cut -f2 -d '|'` for x in $old_repo do - if ( ( pmatch "$x" "xCAT-$OSVER-path*" ) || ( pmatch "$x" "$OSVER-path*" ) ); then + if ( ( pmatch "$x" "xCAT-$OSVER-path*" ) || ( pmatch "$x" "$OSVER-path*" ) || ( pmatch "$x" "xcat-otherpkgs*" ) ); then result=`zypper rr "$x"` fi done @@ -706,8 +706,8 @@ else result=`rm /etc/yum.repos.d/local-repository.repo 2>&1` fi rm /etc/yum.repos.d/$OSVER-path*.repo >/dev/null 2>&1 - result=`rm /etc/yum.repos.d/xCAT-$OSVER-path*.repo 2>&1` - + result=`rm /etc/yum.repos.d/xCAT*.repo 2>&1` + result=`rm /etc/yum.repos.d/xCAT-otherpkgs*.repo 2>&1` fi result=`yum clean all` diff --git a/xCAT/postscripts/otherpkgs b/xCAT/postscripts/otherpkgs index df5f391c1..14352c420 100755 --- a/xCAT/postscripts/otherpkgs +++ b/xCAT/postscripts/otherpkgs @@ -424,7 +424,7 @@ if ( pmatch "$OSVER" "sles11*" && [ $haszypper -eq 1 ] ); then old_repo=`zypper lr |grep -e "^[0-9]" | cut -f2 -d '|'` for x in $old_repo do - if ( ( pmatch "$x" "xCAT-$OSVER-path*" ) || ( pmatch "$x" "$OSVER-path*" ) ); then + if ( ( pmatch "$x" "xCAT-$OSVER*" ) || ( pmatch "$x" "$OSVER-path*" ) || ( pmatch "$x" "xcat-otherpkgs*" ) ); then result=`zypper rr "$x"` fi done @@ -495,6 +495,7 @@ elif ( pmatch "$OSVER" "rhel*" && [ $hasyum -eq 1 ] ); then fi rm /etc/yum.repos.d/$OSVER-path*.repo >/dev/null 2>&1 result=`rm /etc/yum.repos.d/xCAT-$OSVER-path*.repo 2>&1` + result=`rm /etc/yum.repos.d/xCAT-otherpkgs*.repo 2>&1` result=`yum clean all`