Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2013-08-05 20:55:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2013-08-01 11:08:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2013-08-05 20:55:53.000000000 +0200 @@ -1,0 +2,21 @@ +Sun Aug 4 11:48:21 UTC 2013 - lslezak@suse.cz + +- removed empty agents/Makefile.am and unused testsuite/Makefile.am +- removed obsolete BuildRequires: doxygen perl-XML-Writer sgml-skel + yast2-testsuite yast2-storage yast2-pkg-bindings yast2-packager + +------------------------------------------------------------------- +Fri Aug 2 14:25:07 CEST 2013 - jsuchome@suse.cz + +- remove trang from BuildRequires: rng can be created during + packaging, not needed during build + +------------------------------------------------------------------- +Thu Aug 1 11:21:35 CEST 2013 - jsuchome@suse.cz + +- correctly write supporturl (port of bnc#520169) +- limit the number of the searched disks to 8 of each kind to + shorten time needed for finding SSH keys (port of fate#305873) +- 3.0.1 + +------------------------------------------------------------------- Old: ---- yast2-installation-3.0.0.tar.bz2 New: ---- yast2-installation-3.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.bWpAxa/_old 2013-08-05 20:55:54.000000000 +0200 +++ /var/tmp/diff_new_pack.bWpAxa/_new 2013-08-05 20:55:54.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.0.0 +Version: 3.0.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -33,33 +33,17 @@ Source2: YaST2-Firstboot.service BuildRequires: docbook-xsl-stylesheets -BuildRequires: doxygen BuildRequires: libxslt -BuildRequires: perl-XML-Writer -BuildRequires: sgml-skel BuildRequires: update-desktop-files BuildRequires: yast2-core-devel BuildRequires: yast2-devtools -BuildRequires: yast2-testsuite - -# Storage::GetDetectedDiskPaths -BuildRequires: yast2-storage >= 2.24.1 # xmllint -BuildRequires: libxml2 - -# to convert control.rnc o control.rng -BuildRequires: trang +BuildRequires: libxml2-tools -# PackageCallbacks::RegisterEmptyProgressCallbacks() +# /etc/YaST2/XVersion BuildRequires: yast2 >= 2.16.52 -# Pkg::Add/RemoveUpgradeRepo() -BuildRequires: yast2-pkg-bindings >= 2.21.2 - -# Unified progress bar (done by visnov) -BuildRequires: yast2-packager >= 2.17.9 - # AutoinstConfig::getProposalList Requires: autoyast2-installation >= 2.17.1 ++++++ yast2-installation-3.0.0.tar.bz2 -> yast2-installation-3.0.1.tar.bz2 ++++++ ++++ 2017 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-3.0.0/Makefile.am new/yast2-installation-3.0.1/Makefile.am --- old/yast2-installation-3.0.0/Makefile.am 2013-07-31 10:39:27.000000000 +0200 +++ new/yast2-installation-3.0.1/Makefile.am 2013-08-04 22:12:01.000000000 +0200 @@ -193,4 +193,4 @@ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo # test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox # Contents of ./SUBDIRS -SUBDIRS = src agents doc startup control testsuite autoyast_desktop +SUBDIRS = src doc startup control autoyast_desktop diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-3.0.0/Makefile.am.common new/yast2-installation-3.0.1/Makefile.am.common --- old/yast2-installation-3.0.0/Makefile.am.common 2013-07-31 10:39:27.000000000 +0200 +++ new/yast2-installation-3.0.1/Makefile.am.common 2013-08-04 22:12:01.000000000 +0200 @@ -30,10 +30,10 @@ dist-hook: check-syntax CHECK_SYNTAX = true -check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ +check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles) + @if test "$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; then \ if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ + TO_CHECK="$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; \ echo "Checking syntax of $${TO_CHECK}"; \ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ @@ -42,6 +42,20 @@ else \ echo "Syntax check disabled"; \ fi; \ + fi + @if test "$(filter %.rb, $^)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.rb, $^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + for f in $${TO_CHECK}; do \ + if ! ruby -c $$f > /dev/null; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + done; \ + else \ + echo "Syntax check disabled"; \ + fi; \ fi -include .dep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-3.0.0/SUBDIRS new/yast2-installation-3.0.1/SUBDIRS --- old/yast2-installation-3.0.0/SUBDIRS 2013-07-30 13:08:31.000000000 +0200 +++ new/yast2-installation-3.0.1/SUBDIRS 2013-08-04 22:11:49.000000000 +0200 @@ -1 +1 @@ -src agents doc startup control testsuite autoyast_desktop +src doc startup control autoyast_desktop diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-3.0.0/VERSION new/yast2-installation-3.0.1/VERSION --- old/yast2-installation-3.0.0/VERSION 2013-07-30 14:23:32.000000000 +0200 +++ new/yast2-installation-3.0.1/VERSION 2013-08-01 11:41:50.000000000 +0200 @@ -1 +1 @@ -3.0.0 +3.0.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-3.0.0/configure.ac new/yast2-installation-3.0.1/configure.ac --- old/yast2-installation-3.0.0/configure.ac 2013-07-31 10:39:27.000000000 +0200 +++ new/yast2-installation-3.0.1/configure.ac 2013-08-04 22:12:01.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.ac for yast2-installation dnl -dnl -- This file is generated by y2autoconf 2.24.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 3.0.1 - DO NOT EDIT! -- dnl (edit configure.ac.in or configure.in.in instead) -AC_INIT(yast2-installation, 3.0.0, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 3.0.1, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="3.0.0" +VERSION="3.0.1" RPMNAME="yast2-installation" MAINTAINER="Jiří Suchomel <jsuchome@suse.cz>" @@ -149,16 +149,6 @@ AC_MSG_WARN([yast2-testsuite.rpm is not installed]) ]) -dnl Check packages expect and dejagnu -AC_PATH_PROG(MYEXPECT, expect, false) -if test "$MYEXPECT" = "false"; then - AC_MSG_ERROR([expect not installed]) -fi -AC_PATH_PROG(MYRUNTEST, runtest, false) -if test "$MYRUNTEST" = "false"; then - AC_MSG_ERROR([dejagnu not installed]) -fi - ( cd control; for xml in `ls *.xml`; do @@ -197,7 +187,6 @@ AC_SUBST(fvwmdir) AC_CONFIG_FILES(Makefile src/Makefile -agents/Makefile doc/autodocs/Makefile doc/proposal/Makefile doc/features/examples/Makefile @@ -228,7 +217,6 @@ control/tests/Makefile control/examples/Makefile control/Makefile -testsuite/Makefile autoyast_desktop/Makefile) AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-3.0.0/configure.in.in new/yast2-installation-3.0.1/configure.in.in --- old/yast2-installation-3.0.0/configure.in.in 2013-01-22 11:22:35.000000000 +0100 +++ new/yast2-installation-3.0.1/configure.in.in 2013-08-04 22:11:49.000000000 +0200 @@ -10,7 +10,6 @@ ## some common checks @YAST2-CHECKS-COMMON@ @YAST2-CHECKS-YCP@ -@YAST2-CHECKS-TESTSUITE@ ## Nasty hack: xgettext doesn't work for XML files, so let's symlink it ( cd control; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-3.0.0/control/Makefile.am new/yast2-installation-3.0.1/control/Makefile.am --- old/yast2-installation-3.0.0/control/Makefile.am 2013-01-22 11:22:35.000000000 +0100 +++ new/yast2-installation-3.0.1/control/Makefile.am 2013-08-02 20:39:43.000000000 +0200 @@ -1,6 +1,10 @@ # Makefile.am for installation/general # -SUBDIRS = docs tests examples + +# process the current directory first +# (to ensure control.rng file is generated before it is +# used in the examples subdirectory) +SUBDIRS = . docs tests examples controldir = $(yast2dir)/control @@ -22,8 +26,16 @@ # Unfortunately, CVS doesn't support checking in symlinks - it would duplicate # the file. - -EXTRA_DIST = $(control_DATA) $(product_DATA) $(xml_files) +# Distribute also the generated control.rng file, the reason is that "trang" +# is a Java tool which adds huge dependency in OBS. +# +# The conversion happens during "make package" when building the tarball. +# The RNG file gets automatically updated after any change by the "control.rng" +# rule below. +# +# At build time the RNG file from tarball will have a newer time stamp +# and thus it will not need rebuild/update making "trang" unnecessary. +EXTRA_DIST = $(control_DATA) $(product_DATA) $(xml_files) control.rng include $(top_srcdir)/Makefile.am.common @@ -31,7 +43,5 @@ trang -I rnc -O rng control.rnc control.rng # checks only those control files that belong to this package -check-local: - trang -I rnc -O rng control.rnc control.rng - xmllint --relaxng control.rng --noout control.xml - xmllint --relaxng control.rng --noout $(xml_files) +check-local: control.rng + xmllint --relaxng control.rng --noout $(filter %.xml, $(xml_files) $(control_DATA)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-3.0.0/src/clients/inst_pre_install.rb new/yast2-installation-3.0.1/src/clients/inst_pre_install.rb --- old/yast2-installation-3.0.0/src/clients/inst_pre_install.rb 2013-07-30 13:08:31.000000000 +0200 +++ new/yast2-installation-3.0.1/src/clients/inst_pre_install.rb 2013-08-01 08:56:50.000000000 +0200 @@ -250,9 +250,40 @@ end def Initialize Builtins.y2milestone("Evaluating all current partitions") + + # limit the number of the searched disks to 8 of each kind in order to avoid neverending + # mounting of all partitions (fate#305873, bnc#468922) + # FIXME: copy-pasted from partitioner, just different number of disks and added /dev/dasd + restrict_disk_names = lambda do |disks| + disks = deep_copy(disks) + helper = lambda do |s| + count = 0 + disks = Builtins.filter(disks) do |dist| + next true if Builtins.search(dist, s) != 0 + count = Ops.add(count, 1) + Ops.less_or_equal(count, 8) + end + + nil + end + + helper.call("/dev/sd") + helper.call("/dev/hd") + helper.call("/dev/cciss/") + helper.call("/dev/dasd") + + Builtins.y2milestone("restrict_disk_names: ret %1", disks) + deep_copy(disks) + end + target_map = Storage.GetTargetMap counter = -1 - Builtins.foreach(target_map) do |device_name, device_descr| + device_names = Builtins.maplist(target_map) do |device_name, device_descr| + device_name + end + device_names = restrict_disk_names.call(device_names) + Builtins.foreach(device_names) do |device_name| + device_descr = Ops.get(target_map, device_name, {}) partitons = Ops.get_list(device_descr, "partitions", []) filesystem = nil devicename = nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-3.0.0/src/clients/save_config_finish.rb new/yast2-installation-3.0.1/src/clients/save_config_finish.rb --- old/yast2-installation-3.0.0/src/clients/save_config_finish.rb 2013-07-30 13:08:31.000000000 +0200 +++ new/yast2-installation-3.0.1/src/clients/save_config_finish.rb 2013-08-01 11:41:50.000000000 +0200 @@ -214,15 +214,25 @@ if FileUtils.Exists(@config_path) Builtins.y2milestone( "Insert value into supportconfig.conf: %1", - SCR.Execute( - path(".target.bash_output"), - Builtins.sformat( - "echo 'VAR_OPTION_UPLOAD_TARGET=%1'>> %2", - @url, - @config_path - ) + @url + ) + SCR.Execute( + path(".target.bash_output"), + Builtins.sformat( + "sed -i '/VAR_OPTION_UPLOAD_TARGET=.*/d;/^$/d' %1", + @config_path + ) + ) + SCR.Execute( + path(".target.bash_output"), + Builtins.sformat( + "echo \"VAR_OPTION_UPLOAD_TARGET='%1'\">> %2", + @url, + @config_path ) ) + else + Builtins.y2error("filename %1 was not found", @config_path) end end else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-3.0.0/testsuite/Makefile.am new/yast2-installation-3.0.1/testsuite/Makefile.am --- old/yast2-installation-3.0.0/testsuite/Makefile.am 2013-07-30 13:08:31.000000000 +0200 +++ new/yast2-installation-3.0.1/testsuite/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -# -# Makefile.am for .../testsuite -# -# Do not edit this file (Makefile.am) as it will be overwritten! -# - -AUTOMAKE_OPTIONS = dejagnu -EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.rb) - -testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite - -all-local: $(testsuite_prepare) - make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) - -clean-local: $(testsuite_prepare) - make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean - -check-local: $(testsuite_prepare) - make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check - -# EOF -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org