Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2013-07-16 16:32:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old) and /work/SRC/openSUSE:Factory/.yast2-storage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-storage" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2013-07-07 22:28:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2013-07-16 16:32:52.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 11 17:21:35 CEST 2013 - [email protected] + +- prevent usage of mount-by-device instead of default mount-by-id + after encryption was set on and off again (bnc#827481) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage-2.24.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.24.6/Makefile.am new/yast2-storage-2.24.6/Makefile.am --- old/yast2-storage-2.24.6/Makefile.am 2013-07-04 15:56:04.000000000 +0200 +++ new/yast2-storage-2.24.6/Makefile.am 2013-07-11 17:39:59.000000000 +0200 @@ -158,14 +158,19 @@ TAGVERSION = $(Y2TOOL) tagversion -# check if there is no modified files and all commits were pushed -check-up-to-date: - if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \ - (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \ +check-up-to-date check-cvs-up-to-date check-svn-up-to-date: + if [ -d $(srcdir)/CVS ]; then \ + cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\ + else \ + cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\ fi check-tagversion: - cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \ + @if [ -d $(srcdir)/CVS ]; then \ + cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\ + else \ + cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \ + fi >/dev/null; \ [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) check-parse-old: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.24.6/Makefile.am.common new/yast2-storage-2.24.6/Makefile.am.common --- old/yast2-storage-2.24.6/Makefile.am.common 2013-07-04 15:56:04.000000000 +0200 +++ new/yast2-storage-2.24.6/Makefile.am.common 2013-07-11 17:39:59.000000000 +0200 @@ -31,7 +31,7 @@ CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ + @if test "$(client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.24.6/Makefile.in new/yast2-storage-2.24.6/Makefile.in --- old/yast2-storage-2.24.6/Makefile.in 2013-07-04 15:56:16.000000000 +0200 +++ new/yast2-storage-2.24.6/Makefile.in 2013-07-11 17:40:12.000000000 +0200 @@ -1069,14 +1069,19 @@ package: check-up-to-date check-tagversion check-textdomain package-local -# check if there is no modified files and all commits were pushed -check-up-to-date: - if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \ - (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \ +check-up-to-date check-cvs-up-to-date check-svn-up-to-date: + if [ -d $(srcdir)/CVS ]; then \ + cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\ + else \ + cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\ fi check-tagversion: - cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \ + @if [ -d $(srcdir)/CVS ]; then \ + cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\ + else \ + cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \ + fi >/dev/null; \ [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) check-parse-old: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.24.6/configure.in new/yast2-storage-2.24.6/configure.in --- old/yast2-storage-2.24.6/configure.in 2013-07-04 15:56:04.000000000 +0200 +++ new/yast2-storage-2.24.6/configure.in 2013-07-11 17:39:59.000000000 +0200 @@ -1,6 +1,6 @@ dnl configure.in for yast2-storage dnl -dnl -- This file is generated by y2autoconf 2.24.1 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) AC_INIT(yast2-storage, 2.24.6, http://bugs.opensuse.org/, yast2-storage) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.24.6/data/Makefile.in new/yast2-storage-2.24.6/data/Makefile.in --- old/yast2-storage-2.24.6/data/Makefile.in 2013-07-04 15:56:16.000000000 +0200 +++ new/yast2-storage-2.24.6/data/Makefile.in 2013-07-11 17:40:12.000000000 +0200 @@ -556,7 +556,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ + @if test "$(client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.24.6/storage/src/Makefile.in new/yast2-storage-2.24.6/storage/src/Makefile.in --- old/yast2-storage-2.24.6/storage/src/Makefile.in 2013-07-04 15:56:17.000000000 +0200 +++ new/yast2-storage-2.24.6/storage/src/Makefile.in 2013-07-11 17:40:13.000000000 +0200 @@ -787,7 +787,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ + @if test "$(client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.24.6/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.24.6/storage/src/include/custom_part_lib.ycp --- old/yast2-storage-2.24.6/storage/src/include/custom_part_lib.ycp 2013-02-26 17:51:36.000000000 +0100 +++ new/yast2-storage-2.24.6/storage/src/include/custom_part_lib.ycp 2013-07-11 17:39:49.000000000 +0200 @@ -806,7 +806,7 @@ if( ret == `crypt_fs ) { boolean val = (boolean)UI::QueryWidget( `id(`crypt_fs), `Value ); - new["enc_type"] = val?(new["format"]:false?`twofish:`twofish_old):`none; + new["enc_type"] = val?(new["format"]:false?`luks:`twofish):`none; if( val ) { new["mountby"] = `device; @@ -815,6 +815,10 @@ if( !Stage::initial() ) Package::InstallAll( ["cryptsetup", "cryptsetup-mkinitrd", "pam_mount"] ); } + else + { + new = remove( new, "mountby" ); + } } if( ret == `fs_options ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.24.6/storage/src/modules/Makefile.in new/yast2-storage-2.24.6/storage/src/modules/Makefile.in --- old/yast2-storage-2.24.6/storage/src/modules/Makefile.in 2013-07-04 15:56:17.000000000 +0200 +++ new/yast2-storage-2.24.6/storage/src/modules/Makefile.in 2013-07-11 17:40:13.000000000 +0200 @@ -579,7 +579,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ + @if test "$(client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.24.6/storage/src/proposal/Makefile.in new/yast2-storage-2.24.6/storage/src/proposal/Makefile.in --- old/yast2-storage-2.24.6/storage/src/proposal/Makefile.in 2013-07-04 15:56:17.000000000 +0200 +++ new/yast2-storage-2.24.6/storage/src/proposal/Makefile.in 2013-07-11 17:40:13.000000000 +0200 @@ -556,7 +556,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ + @if test "$(client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
