Hello community, here is the log from the commit of package inst-source-utils checked in at Mon Nov 17 17:03:49 CET 2008. -------- --- inst-source-utils/inst-source-utils.changes 2008-10-16 17:55:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/inst-source-utils/inst-source-utils.changes 2008-11-13 00:14:18.672289000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 13 00:14:01 CET 2008 - ro@suse.de + +- mk_listings: exclude .cr-cache and .snapshot + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inst-source-utils.spec ++++++ --- /var/tmp/diff_new_pack.hd9252/_old 2008-11-17 17:03:37.000000000 +0100 +++ /var/tmp/diff_new_pack.hd9252/_new 2008-11-17 17:03:37.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package inst-source-utils (Version 2008.10.16) +# spec file for package inst-source-utils (Version 2008.11.17) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,8 +25,8 @@ Obsoletes: autoyast2-utils <= 2.14.10 Provides: autoyast2-utils = 2.14.10 Summary: Utilities for creating customized installation sources -Version: 2008.10.16 -Release: 2 +Version: 2008.11.17 +Release: 1 Source: inst-source-utils.tar.bz2 Source1: split.pl BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -60,6 +60,8 @@ %_datadir/%name %changelog +* Thu Nov 13 2008 ro@suse.de +- mk_listings: exclude .cr-cache and .snapshot * Thu Oct 16 2008 lrupp@suse.de - create_sha1sums: + also put the GPG key in each slideshow directory ++++++ inst-source-utils.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inst-source-utils/usr/bin/create_sha1sums new/inst-source-utils/usr/bin/create_sha1sums --- old/inst-source-utils/usr/bin/create_sha1sums 2008-10-16 20:07:15.000000000 +0200 +++ new/inst-source-utils/usr/bin/create_sha1sums 2008-11-17 17:03:30.000000000 +0100 @@ -19,7 +19,7 @@ # Boston, MA 02110-1301, # USA. # -# $Id: create_sha1sums,v 1.4 2008/06/25 11:20:49 lrupp Exp lrupp $ +# $Id: create_sha1sums,v 1.6 2008/11/10 21:41:56 lrupp Exp lrupp $ # SIGN="yes" @@ -39,7 +39,7 @@ } function signit(){ - if [ "$(which sign)" != "" ]; then + if [ "$(which sign 2>/dev/null)" != "" ]; then sign $SIGN_OPTS -d $1 else gpg -a -b $1 @@ -82,18 +82,19 @@ if [ -z "$DESCRDIR" ]; then DESCRDIR="suse/setup/descr" fi -pushd $CDS_PRIM/$DESCRDIR >/dev/null -rm -f *.asc -sha1sum * 2>/dev/null | grep -v "MD5SUMS" | grep -v "directory.yast" | sed -e "s@^@META SHA1 @" >> $CDS_PRIM/content -popd >/dev/null - +if test -d $CDS_PRIM/$DESCRDIR ; then + pushd $CDS_PRIM/$DESCRDIR >/dev/null + rm -f *.asc + sha1sum * 2>/dev/null | grep -v "MD5SUMS" | grep -v "directory.yast" | sed -e "s@^@META SHA1 @" >> $CDS_PRIM/content + popd >/dev/null +fi pushd $CDS_PRIM >/dev/null if [ "$EXTRA" = "yes" ] ; then for i in license.tar.gz control.xml installation.xml media.1/info.txt ; do test -f $i || continue sha1sum $i 2>/dev/null | sed -e "s@^@HASH SHA1 @" >> $CDS_PRIM/content done - for i in boot/*/* boot/*/loader/linux boot/*/loader/initrd boot/*/loader/*.spl images/* ; do + for i in boot/*/* boot/*/loader/linux boot/*/loader/initrd boot/*/loader/*.spl docu/* images/* ; do test -f $i || continue sha1sum $i 2>/dev/null | sed -e "s@^@HASH SHA1 @" >> $CDS_PRIM/content done @@ -103,7 +104,9 @@ if [ -d "$CDS_PRIM/$DATADIR/setup/slide" ]; then SLIDESHOWDIR="$CDS_PRIM/$DATADIR/setup/slide" fi - create_sha1sum --quiet "$SLIDESHOWDIR" + if test -n "$SLIDESHOWDIR" -a -d "$SLIDESHOWDIR" ; then + //bin/tools/create_sha1sum --quiet "$SLIDESHOWDIR" + fi for sha1sumfile in $(find $SLIDESHOWDIR -name SHA1SUMS); do signit "$sha1sumfile" done @@ -128,6 +131,7 @@ REPOFILE=${REPOFILE##/} for file in content media.1/products $REPOFILE; do test -f $CDS_PRIM/${file}.asc && rm -f $CDS_PRIM/${file}.asc + test -f $CDS_PRIM/${file} || continue signit $CDS_PRIM/${file} done @@ -160,5 +164,8 @@ # make sure everything is readable for all for file in content media.1/products $REPOFILE; do - chmod 644 $CDS_PRIM/$file* + for xfile in $CDS_PRIM/$file* ; do + test -e $xfile || continue + chmod 644 $xfile + done done diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inst-source-utils/usr/bin/mk_listings new/inst-source-utils/usr/bin/mk_listings --- old/inst-source-utils/usr/bin/mk_listings 2008-10-16 20:07:15.000000000 +0200 +++ new/inst-source-utils/usr/bin/mk_listings 2008-11-17 17:03:30.000000000 +0100 @@ -107,7 +107,7 @@ print "INFO: creating ls-lR.gz, INDEX.gz and ARCHIVES.gz\n"; -open ( FINDALL , "cd \"$arg\" ; find . -type f | grep -v allrpms |" ); +open ( FINDALL , "cd \"$arg\" ; find . -type f | grep -vE \"allrpms|\.cr-cache|\.snapshot\" |"); my @FINDALL = <FINDALL>; close ( FINDALL ); my @FINDALL2 = @FINDALL; ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.hd9252/_old 2008-11-17 17:03:37.000000000 +0100 +++ /var/tmp/diff_new_pack.hd9252/_new 2008-11-17 17:03:37.000000000 +0100 @@ -41,7 +41,7 @@ # don't package lines between <!--internal--> and <!--/internal--> for i in $TOPDIR$BINDIR/*; do - `dirname $0`/split.pl $i $i.new + perl `dirname $0`/split.pl $i $i.new mv $i.new $i chmod 755 $i done ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org