Hello community, here is the log from the commit of package inst-source-utils for openSUSE:Factory checked in at 2014-03-18 16:21:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old) and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "inst-source-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes 2014-03-06 19:18:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes 2014-03-18 16:21:17.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Mar 14 02:38:32 CET 2014 - [email protected] + +- create_sha1sums: skip content file actions if content file + does not exist + +------------------------------------------------------------------- +Wed Mar 12 17:56:59 CET 2014 - [email protected] + +- fix bogus code in rezip-repo-rsyncable + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inst-source-utils.spec ++++++ --- /var/tmp/diff_new_pack.uvfVaB/_old 2014-03-18 16:21:18.000000000 +0100 +++ /var/tmp/diff_new_pack.uvfVaB/_new 2014-03-18 16:21:18.000000000 +0100 @@ -20,7 +20,7 @@ Summary: Utilities for creating customized installation sources License: GPL-2.0+ Group: System/YaST -Version: 2014.3.5 +Version: 2014.3.14 Release: 0 Url: http://en.opensuse.org/Inst-source-utils BuildArch: noarch ++++++ 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 2014-03-05 14:34:15.000000000 +0100 +++ new/inst-source-utils/usr/bin/create_sha1sums 2014-03-14 02:38:18.000000000 +0100 @@ -91,59 +91,61 @@ CDS_PRIM=$(pwd) fi -# prepare content file -CONTTMP=$(mktemp $CDS_PRIM/content-XXXXXX) -grep -v "^META " $CDS_PRIM/content | grep -v "^KEY " | grep -v "^HASH SHA" > $CONTTMP -mv $CONTTMP $CDS_PRIM/content - -# add pattern and packages files to content file -DESCRDIR=`grep DESCRDIR $CDS_PRIM/content | awk '" " { print $2 }'` -if [ -z "$DESCRDIR" ]; then - DESCRDIR="suse/setup/descr" -fi -if test -d $CDS_PRIM/$DESCRDIR ; then - pushd $CDS_PRIM/$DESCRDIR >/dev/null - rm -f *.asc - $CHECKSUM * 2>/dev/null | grep -v "MD5SUMS" | grep -v "directory.yast" | sed -e "s@^@META $CHECKSUM_T @" >> $CDS_PRIM/content +if [ -f $CDS_PRIM/content ] ; then + # prepare content file + CONTTMP=$(mktemp $CDS_PRIM/content-XXXXXX) + grep -v "^META " $CDS_PRIM/content | grep -v "^KEY " | grep -v "^HASH SHA" > $CONTTMP + mv $CONTTMP $CDS_PRIM/content + + # add pattern and packages files to content file + DESCRDIR=`grep DESCRDIR $CDS_PRIM/content | awk '" " { print $2 }'` + if [ -z "$DESCRDIR" ]; then + DESCRDIR="suse/setup/descr" + fi + if test -d $CDS_PRIM/$DESCRDIR ; then + pushd $CDS_PRIM/$DESCRDIR >/dev/null + rm -f *.asc + $CHECKSUM * 2>/dev/null | grep -v "MD5SUMS" | grep -v "directory.yast" | sed -e "s@^@META $CHECKSUM_T @" >> $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 media.1/license.zip y2update.tgz driverupdate; do + test -f $i || continue + $CHECKSUM $i 2>/dev/null | sed -e "s@^@HASH $CHECKSUM_T @" >> $CDS_PRIM/content + done + for i in boot/*/* boot/*/loader/linux boot/*/loader/initrd boot/*/loader/*.spl docu/* images/* ; do + test -f $i || continue + $CHECKSUM $i 2>/dev/null | sed -e "s@^@HASH $CHECKSUM_T @" >> $CDS_PRIM/content + done + # check if we need to include additional files for > 11.0 + if grep -q CONTENTSTYLE $CDS_PRIM/content; then + DATADIR=$(grep DATADIR content | awk '" " { print $2 }') + if [ -d "$CDS_PRIM/$DATADIR/setup/slide" ]; then + SLIDESHOWDIR="$CDS_PRIM/$DATADIR/setup/slide" + fi + if test -n "$SLIDESHOWDIR" -a -d "$SLIDESHOWDIR" ; then + /usr/bin/create_sha1sum $CHECKSUM_O --quiet "$SLIDESHOWDIR" + fi + if [ $SIGN = "yes" ]; then + for sha1sumfile in $(find $SLIDESHOWDIR -name $CHECKSUM_F); do + signit "$sha1sumfile" + done + fi + fi + + fi + if [ "$INCLUDE_SHA1SUMS" = "yes" ]; then + for i in $(find $CDS_PRIM/ -name $CHECKSUM_F | sed -e "s|./||"); do + test -f $i || continue + $CHECKSUM $i 2>/dev/null | sed -e "s@^@HASH $CHECKSUM_T @" >> $CDS_PRIM/content + done + fi + + # add gpg-key files to content file + $CHECKSUM gpg-pubkey-* 2>/dev/null | sed -e "s@^@KEY $CHECKSUM_T @" >> $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 media.1/license.zip y2update.tgz driverupdate; do - test -f $i || continue - $CHECKSUM $i 2>/dev/null | sed -e "s@^@HASH $CHECKSUM_T @" >> $CDS_PRIM/content - done - for i in boot/*/* boot/*/loader/linux boot/*/loader/initrd boot/*/loader/*.spl docu/* images/* ; do - test -f $i || continue - $CHECKSUM $i 2>/dev/null | sed -e "s@^@HASH $CHECKSUM_T @" >> $CDS_PRIM/content - done - # check if we need to include additional files for > 11.0 - if grep -q CONTENTSTYLE $CDS_PRIM/content; then - DATADIR=$(grep DATADIR content | awk '" " { print $2 }') - if [ -d "$CDS_PRIM/$DATADIR/setup/slide" ]; then - SLIDESHOWDIR="$CDS_PRIM/$DATADIR/setup/slide" - fi - if test -n "$SLIDESHOWDIR" -a -d "$SLIDESHOWDIR" ; then - /usr/bin/create_sha1sum $CHECKSUM_O --quiet "$SLIDESHOWDIR" - fi - if [ $SIGN = "yes" ]; then - for sha1sumfile in $(find $SLIDESHOWDIR -name $CHECKSUM_F); do - signit "$sha1sumfile" - done - fi - fi - -fi -if [ "$INCLUDE_SHA1SUMS" = "yes" ]; then - for i in $(find $CDS_PRIM/ -name $CHECKSUM_F | sed -e "s|./||"); do - test -f $i || continue - $CHECKSUM $i 2>/dev/null | sed -e "s@^@HASH $CHECKSUM_T @" >> $CDS_PRIM/content - done -fi - -# add gpg-key files to content file -$CHECKSUM gpg-pubkey-* 2>/dev/null | sed -e "s@^@KEY $CHECKSUM_T @" >> $CDS_PRIM/content -popd >/dev/null # signing part if [ $SIGN = "yes" ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inst-source-utils/usr/bin/rezip_repo_rsyncable new/inst-source-utils/usr/bin/rezip_repo_rsyncable --- old/inst-source-utils/usr/bin/rezip_repo_rsyncable 2014-03-05 14:34:15.000000000 +0100 +++ new/inst-source-utils/usr/bin/rezip_repo_rsyncable 2014-03-14 02:38:18.000000000 +0100 @@ -65,11 +65,12 @@ $arg .= "/repodata" unless $arg =~ /\/repodata/; system ("touch", "$tmpdir/fff"); -system (`gzip --rsyncable "$tmpdir/fff" >/dev/null 2>/dev/null`); +system ("gzip --rsyncable \"$tmpdir/fff\" >/dev/null 2>/dev/null"); if ( -f "$tmpdir/fff.gz" ) { $rsyncable = "--rsyncable"; } -system ("rm", "-f", "$tmpdir/fff", "$tmpdir/fff.gz"); +unlink ("$tmpdir/fff"); +unlink ("$tmpdir/fff.gz"); if ( $rsyncable ) { my @GZIPPED = glob("$arg/*.gz"); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
