Hello community, here is the log from the commit of package patterns checked in at Wed Mar 19 01:36:11 CET 2008. -------- --- patterns/patterns.changes 2008-03-06 20:33:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/patterns/patterns.changes 2008-03-18 17:02:59.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 18 17:02:54 CET 2008 - coolo@suse.de + +- fixes to be run in chroot + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns.spec ++++++ --- /var/tmp/diff_new_pack.Yp5097/_old 2008-03-19 01:36:02.000000000 +0100 +++ /var/tmp/diff_new_pack.Yp5097/_new 2008-03-19 01:36:02.000000000 +0100 @@ -18,7 +18,7 @@ AutoReqProv: on Summary: Patterns Translation Tool Version: 1.1031 -Release: 144 +Release: 147 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: patterns-1.1031.tar.bz2 Source1: create_pattern.sh @@ -57,6 +57,8 @@ %_sbindir/create_pattern.sh %changelog +* Tue Mar 18 2008 coolo@suse.de +- fixes to be run in chroot * Thu Mar 06 2008 coolo@suse.de - make it possible to do everything arch specific * Sun Mar 02 2008 coolo@suse.de ++++++ create_pattern.sh ++++++ --- patterns/create_pattern.sh 2008-03-06 19:59:26.000000000 +0100 +++ /mounts/work_src_done/STABLE/patterns/create_pattern.sh 2008-03-18 17:00:52.000000000 +0100 @@ -11,7 +11,7 @@ warnings=`mktemp /tmp/fileXXXXXX` -for pat in `ls -A toinstall` ; do +for pat in `/bin/ls toinstall` ; do if [ -f toinstall/$pat/skip ] ; then echo "Skipping $pat" @@ -167,7 +167,7 @@ ;; esac rpmids=/.rpm-cache/$BUILD_BASENAME/rpm.deps.id - if ! grep -q "^P:$line-[^-]*-[^-]*-[^-]*:" $rpmids; then + if test -f $rpmids && ! grep -q "^P:$line-[^-]*-[^-]*-[^-]*:" $rpmids; then if grep -q "^P:.* $line " $rpmids || grep -q "^P:.* $line"'$' $rpmids; then ( grep "^P:.* $line " $rpmids ; grep "^P:.* $line"'$' $rpmids ) | sed -e 's,^P:\([^ ]*\)-[^-]*-[^-]*-[^-]*:.*,\1,' | \ while read out; do echo "Provides $line is only virtual: $out"; done @@ -214,20 +214,22 @@ echo -e "+Ext:\n32bit\n-Ext:\n\n" >> tmpfile echo "+Prc:" >> tmpfile rpmids=/.rpm-cache/$BUILD_BASENAME/rpm.deps.id - for DATA in `bash $RPM_SOURCE_DIR/preprocess toinstall/$pat/sel`; do - for i in `bash $RPM_SOURCE_DIR/preprocess data/$DATA | grep -v -e Prq\: -e Prc\: -e Psg\: -e '^#'` ; do - package=$i-$pat_ext - if ! grep -q "^P:$package-[^-]*-[^-]*-[^-]*:" $rpmids; then - if grep -q "^P:.* $package " $rpmids || grep -q "^P:.* $package"'$' $rpmids; then - ( grep "^P:.* $package " $rpmids ; grep "^P:.* $package"'$' $rpmids ) | sed -e 's,^P:\([^ ]*\)-[^-]*-[^-]*-[^-]*:.*,\1,' | \ - while read out; do echo "Provides $package is only virtual: $out"; done - echo $package >> tmpfile - fi - else - echo $package >> tmpfile - fi + if test -f $rpmids; then + for DATA in `bash $RPM_SOURCE_DIR/preprocess toinstall/$pat/sel`; do + for i in `bash $RPM_SOURCE_DIR/preprocess data/$DATA | grep -v -e Prq\: -e Prc\: -e Psg\: -e '^#'` ; do + package=$i-$pat_ext + if ! grep -q "^P:$package-[^-]*-[^-]*-[^-]*:" $rpmids; then + if grep -q "^P:.* $package " $rpmids || grep -q "^P:.* $package"'$' $rpmids; then + ( grep "^P:.* $package " $rpmids ; grep "^P:.* $package"'$' $rpmids ) | sed -e 's,^P:\([^ ]*\)-[^-]*-[^-]*-[^-]*:.*,\1,' | \ + while read out; do echo "Provides $package is only virtual: $out"; done + echo $package >> tmpfile + fi + else + echo $package >> tmpfile + fi + done done - done + fi echo "-Prc:" >> tmpfile mv tmpfile $RPM_BUILD_ROOT/CD1/suse/setup/descr/$pat-$pat_ext-${version}-${release}.${target_cpu}.pat fi @@ -236,5 +238,6 @@ done sort -u $warnings +#test ! -s $warnings || exit 1 rm $warnings ++++++ patterns-1.1031.tar.bz2 ++++++ ++++ 6170 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de