Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2013-04-26 07:49:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2013-04-03 13:10:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2013-04-26 07:49:03.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Apr 17 12:18:35 UTC 2013 - [email protected] + +- fixed check for disabled SSL verification (bnc#807799) + +------------------------------------------------------------------- +Tue Apr 16 12:06:35 UTC 2013 - [email protected] + +- sw_single.ycp removed function nesting, updated manual-tests, + removed old-tests (for YCP -> Ruby conversion) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager-2.24.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.24.0/Makefile.am new/yast2-packager-2.24.0/Makefile.am --- old/yast2-packager-2.24.0/Makefile.am 2013-03-26 10:31:42.000000000 +0100 +++ new/yast2-packager-2.24.0/Makefile.am 2013-04-17 14:36:41.000000000 +0200 @@ -158,19 +158,14 @@ TAGVERSION = $(Y2TOOL) tagversion -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' ;\ +# 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) \ fi check-tagversion: - @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; \ + cd $(srcdir) && $(TAGVERSION) --check >/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-packager-2.24.0/Makefile.am.common new/yast2-packager-2.24.0/Makefile.am.common --- old/yast2-packager-2.24.0/Makefile.am.common 2013-03-26 10:31:42.000000000 +0100 +++ new/yast2-packager-2.24.0/Makefile.am.common 2013-04-17 14:36:41.000000000 +0200 @@ -31,7 +31,7 @@ CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,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-packager-2.24.0/Makefile.in new/yast2-packager-2.24.0/Makefile.in --- old/yast2-packager-2.24.0/Makefile.in 2013-03-26 10:31:47.000000000 +0100 +++ new/yast2-packager-2.24.0/Makefile.in 2013-04-17 14:36:46.000000000 +0200 @@ -980,19 +980,14 @@ package: check-up-to-date check-tagversion check-textdomain package-local -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' ;\ +# 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) \ fi check-tagversion: - @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; \ + cd $(srcdir) && $(TAGVERSION) --check >/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-packager-2.24.0/configure.in new/yast2-packager-2.24.0/configure.in --- old/yast2-packager-2.24.0/configure.in 2013-03-26 10:31:42.000000000 +0100 +++ new/yast2-packager-2.24.0/configure.in 2013-04-17 14:36:41.000000000 +0200 @@ -1,6 +1,6 @@ dnl configure.in for yast2-packager dnl -dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) AC_INIT(yast2-packager, 2.24.0, http://bugs.opensuse.org/, yast2-packager) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.24.0/src/clients/Makefile.in new/yast2-packager-2.24.0/src/clients/Makefile.in --- old/yast2-packager-2.24.0/src/clients/Makefile.in 2013-03-26 10:31:47.000000000 +0100 +++ new/yast2-packager-2.24.0/src/clients/Makefile.in 2013-04-17 14:36:46.000000000 +0200 @@ -490,7 +490,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,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-packager-2.24.0/src/clients/sw_single.ycp new/yast2-packager-2.24.0/src/clients/sw_single.ycp --- old/yast2-packager-2.24.0/src/clients/sw_single.ycp 2013-01-22 11:40:37.000000000 +0100 +++ new/yast2-packager-2.24.0/src/clients/sw_single.ycp 2013-04-16 14:11:33.000000000 +0200 @@ -41,39 +41,13 @@ import "String"; import "URL"; -boolean force_summary = false; - -symbol StartSWSingle() -{ - - Wizard::CreateDialog(); - Wizard::SetDesktopTitleAndIcon("sw_single"); - - // a stage in the progress dialog - list<string> stages = [_("Initialize the Target System"), _("Load the Configured Repositories")]; - - // an extra step is needed in dir inst mode - if (Installation::destdir != "/") - { - y2internal("Extra step is needed"); - // %1 is path to the target system (e.g. /tmp/dirinstall - sformat(_("Reset the target system to %1"), Installation::destdir); - } - - // a stage in the progress dialog - Progress::New(_("Starting the Software Manager"), "", 2, stages, [], ""); - Progress::NextStage(); - - import "Packages"; - - list<string> packagelist = []; // list of packages to act on + boolean force_summary = false; // `install // `remove, `update: used from gnome-main-menu (#222757) symbol action = `install; - boolean test_popup = false; - boolean skip_source = false; + list<string> packagelist = []; // list of packages to act on // ============================================================= @@ -444,7 +418,30 @@ } // ============================================================= +symbol StartSWSingle() +{ + + Wizard::CreateDialog(); + Wizard::SetDesktopTitleAndIcon("sw_single"); + // a stage in the progress dialog + list<string> stages = [_("Initialize the Target System"), _("Load the Configured Repositories")]; + + // an extra step is needed in dir inst mode + if (Installation::destdir != "/") + { + y2internal("Extra step is needed"); + // %1 is path to the target system (e.g. /tmp/dirinstall + sformat(_("Reset the target system to %1"), Installation::destdir); + } + + // a stage in the progress dialog + Progress::New(_("Starting the Software Manager"), "", 2, stages, [], ""); + Progress::NextStage(); + + import "Packages"; + + boolean skip_source = false; // check whether running as root // and having the packager for ourselves diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.24.0/src/config/Makefile.in new/yast2-packager-2.24.0/src/config/Makefile.in --- old/yast2-packager-2.24.0/src/config/Makefile.in 2013-03-26 10:31:47.000000000 +0100 +++ new/yast2-packager-2.24.0/src/config/Makefile.in 2013-04-17 14:36:46.000000000 +0200 @@ -488,7 +488,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,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-packager-2.24.0/src/modules/InstURL.ycp new/yast2-packager-2.24.0/src/modules/InstURL.ycp --- old/yast2-packager-2.24.0/src/modules/InstURL.ycp 2013-03-26 10:31:35.000000000 +0100 +++ new/yast2-packager-2.24.0/src/modules/InstURL.ycp 2013-04-17 14:36:34.000000000 +0200 @@ -122,7 +122,7 @@ string ssl_verify = Linuxrc::InstallInf("ssl_verify"); y2milestone("Option ssl_verify: %1", ssl_verify); - return ssl_verify != "0"; + return ssl_verify != "no"; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.24.0/src/modules/Makefile.in new/yast2-packager-2.24.0/src/modules/Makefile.in --- old/yast2-packager-2.24.0/src/modules/Makefile.in 2013-03-26 10:31:47.000000000 +0100 +++ new/yast2-packager-2.24.0/src/modules/Makefile.in 2013-04-17 14:36:47.000000000 +0200 @@ -492,7 +492,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,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]
