Commit deb2ddc5 authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmunmets: improve print out

parent e56dd0b6
...@@ -19,7 +19,7 @@ make_ordinalbox() ...@@ -19,7 +19,7 @@ make_ordinalbox()
mkdir -p $ORDINALWORKDIR mkdir -p $ORDINALWORKDIR
echo "Build aptbox from ordinal repo in $ORDINALWORKDIR ..." echo "Build aptbox from ordinal repo in $ORDINALWORKDIR ..."
#rm -rf $ORDINALWORKDIR #rm -rf $ORDINALWORKDIR
$MKAPTBOX -f --apt-config=$ORDINALAPTCONF $ORDINALWORKDIR docmd $MKAPTBOX -f --apt-config=$ORDINALAPTCONF $ORDINALWORKDIR
} }
make_testingbox() make_testingbox()
...@@ -27,7 +27,7 @@ make_testingbox() ...@@ -27,7 +27,7 @@ make_testingbox()
mkdir -p $TESTINGWORKDIR mkdir -p $TESTINGWORKDIR
echo "Build aptbox from testing repo in $TESTINGWORKDIR ..." echo "Build aptbox from testing repo in $TESTINGWORKDIR ..."
#rm -rf $TESTINGWORKDIR #rm -rf $TESTINGWORKDIR
$MKAPTBOX -f --apt-config=$TESTINGAPTCONF $TESTINGWORKDIR docmd $MKAPTBOX -f --apt-config=$TESTINGAPTCONF $TESTINGWORKDIR
} }
...@@ -73,6 +73,7 @@ mygetopts $LISTARGS ...@@ -73,6 +73,7 @@ mygetopts $LISTARGS
ORDINALWORKDIR=$OURTMPDIR/WD1 ORDINALWORKDIR=$OURTMPDIR/WD1
TESTINGWORKDIR=$OURTMPDIR/WD2 TESTINGWORKDIR=$OURTMPDIR/WD2
# apt.conf for current system
ORDINALAPTCONF=$APTCONF ORDINALAPTCONF=$APTCONF
set_hasherdir set_hasherdir
...@@ -82,27 +83,30 @@ if [ ! -d $HASHERDIR/repo ] || [ -n "$SKIPTST" ] ; then ...@@ -82,27 +83,30 @@ if [ ! -d $HASHERDIR/repo ] || [ -n "$SKIPTST" ] ; then
make_ordinalbox make_ordinalbox
echo echo
echo "All unmets in repo $MENV" echo "All unmets in repo $MENV"
$ORDINALWORKDIR/aptbox/apt-cache unmet docmd $ORDINALWORKDIR/aptbox/apt-cache unmet
rm -rf $ORDINALWORKDIR rm -rf $ORDINALWORKDIR
exit 0 exit 0
fi fi
echo "Prepare to unmets checking..." echo "Prepare to unmets checking..."
# Prepare our confdir
# Prepare modified confdir
prepare_aptconfig prepare_aptconfig
TESTINGAPTCONF=$OURAPTCONF TESTINGAPTCONF=$OURAPTCONF
echo "rpm file:$HASHERDIR/repo/ $BUILDARCH hasher" >>$OURSOURCES
echo "rpm file:$HASHERDIR/repo/ $BUILDARCH hasher" | tee -a $OURSOURCES
make_ordinalbox make_ordinalbox
make_testingbox make_testingbox
echo
echo "Calculate unmets..." echo "Calculate unmets..."
$ORDINALWORKDIR/aptbox/apt-cache unmet > $OURTMPDIR/unmets.old $ORDINALWORKDIR/aptbox/apt-cache unmet > $OURTMPDIR/unmets.old
$TESTINGWORKDIR/aptbox/apt-cache unmet > $OURTMPDIR/unmets.new $TESTINGWORKDIR/aptbox/apt-cache unmet > $OURTMPDIR/unmets.new
echo echo
echo "New unmets:" echo "New unmets:"
diff -U0 $OURTMPDIR/unmets.{old,new} diff -U0 $OURTMPDIR/unmets.{old,new} && echo "NO UNMETS detected."
if [ ! -d "$SISYPHUSPATH" ] ; then if [ ! -d "$SISYPHUSPATH" ] ; then
echo "Sisyphus repo is not found in '$SISYPHUSPATH'. Set SISYPHUSPATH to compare requires with new packages" echo "Sisyphus repo is not found in '$SISYPHUSPATH'. Set SISYPHUSPATH to compare requires with new packages"
...@@ -112,17 +116,22 @@ fi ...@@ -112,17 +116,22 @@ fi
NEWPKGDIR=$HASHERDIR/repo/$BUILDARCH/RPMS.hasher/ NEWPKGDIR=$HASHERDIR/repo/$BUILDARCH/RPMS.hasher/
echo echo
echo "Compare requires between new packages and their Sisyphus version" echo "Compare requires between new packages and their Sisyphus version..."
export LESS_PROGRAM=/dev/null export LESS_PROGRAM=/dev/null
for i in $(echo $NEWPKGDIR/*.rpm) ; do for i in $(echo $NEWPKGDIR/*.rpm) ; do
echo -n "."
# FIXME: use function to get package name
OLDPKGNAME=$(rpm -qp $i | sed -e "s|-[0-9].*||g") OLDPKGNAME=$(rpm -qp $i | sed -e "s|-[0-9].*||g")
echo -n "."
# search in the our arch repo # search in the our arch repo
PKGARCH=$(querypackage $i ARCH) PKGARCH=$(querypackage $i ARCH)
echo -n "."
OLDPKG=$(echo $SISYPHUSPATH/$PKGARCH/RPMS.*/$OLDPKGNAME-[0-9]*.rpm) OLDPKG=$(echo $SISYPHUSPATH/$PKGARCH/RPMS.*/$OLDPKGNAME-[0-9]*.rpm)
if [ ! -r "$OLDPKG" ] ; then if [ ! -r "$OLDPKG" ] ; then
echo "Cannot find old package for $(basename $i), skipping" echo "Cannot find old package for $(basename $i), skipping"
continue continue
fi fi
echo
echo "Compare $OLDPKG with new $i" echo "Compare $OLDPKG with new $i"
compare_packages -a -R -- $OLDPKG -- $i compare_packages -a -R -- $OLDPKG -- $i
done done
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment