February 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67350 - /trunk/iscsi-client/src/IscsiClientLib.ycp
by fehr＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: fehr Date: Thu Feb 2 12:14:24 2012 New Revision: 67350 URL: http://svn.opensuse.org/viewcvs/yast?rev=67350&view=rev Log: debug output Modified: trunk/iscsi-client/src/IscsiClientLib.ycp Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.… ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Thu Feb 2 12:14:24 2012 @@ -381,7 +381,7 @@ } ret = writeInitiatorName(initiatorname); } else { - y2internal("initiatorname=%1", initiatorname); + y2milestone("checkInitiatorName initiatorname=%1", initiatorname); if (size(name_from_bios)>0 && name_from_bios!=initiatorname) { Popup::Warning( _("InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt> differ. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67349 - /trunk/autoinstallation/doc/xml/Makefile.am
by ug＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: ug Date: Thu Feb 2 11:55:14 2012 New Revision: 67349 URL: http://svn.opensuse.org/viewcvs/yast?rev=67349&view=rev Log: typo Modified: trunk/autoinstallation/doc/xml/Makefile.am Modified: trunk/autoinstallation/doc/xml/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/Makefil… ============================================================================== --- trunk/autoinstallation/doc/xml/Makefile.am (original) +++ trunk/autoinstallation/doc/xml/Makefile.am Thu Feb 2 11:55:14 2012 @@ -52,7 +52,6 @@ #pdf: # daps -e ENV-autoyast --basedir=$(DAPS_BASE) pdf-color # mkdir -p pdf -# echo "$(PDF_FILE) xxx" # cp -a $(PDF_FILE) pdf pkgsrc: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67348 - in /trunk/autoinstallation: autoyast2.spec.in doc/Makefile.am doc/xml/Makefile.am
by ug＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: ug Date: Thu Feb 2 11:54:14 2012 New Revision: 67348 URL: http://svn.opensuse.org/viewcvs/yast?rev=67348&view=rev Log: fixed the docu build, deactivated pdf build ... holy cow Modified: trunk/autoinstallation/autoyast2.spec.in trunk/autoinstallation/doc/Makefile.am trunk/autoinstallation/doc/xml/Makefile.am Modified: trunk/autoinstallation/autoyast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/autoyast2.spec.… ============================================================================== --- trunk/autoinstallation/autoyast2.spec.in (original) +++ trunk/autoinstallation/autoyast2.spec.in Thu Feb 2 11:54:14 2012 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST License: GPL-2.0+ -BuildRequires: yast2-mouse yast2-transfer yast2-bootloader xorg-x11-libs yast2-devtools pkg-config libxslt perl-XML-Writer docbook-xsl-stylesheets sgml-skel yast2-testsuite update-desktop-files yast2-country yast2-slp +BuildRequires: yast2-mouse yast2-transfer yast2-bootloader xorg-x11-libs yast2-devtools pkg-config libxslt perl-XML-Writer docbook-xsl-stylesheets sgml-skel yast2-testsuite update-desktop-files yast2-country yast2-slp daps python-xml # API for Disabled Modules (ProductControl) BuildRequires: yast2 >= 2.16.36 # After API cleanup Modified: trunk/autoinstallation/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/Makefile.am… ============================================================================== --- trunk/autoinstallation/doc/Makefile.am (original) +++ trunk/autoinstallation/doc/Makefile.am Thu Feb 2 11:54:14 2012 @@ -4,24 +4,25 @@ # $Id$ # -#SUBDIRS = xml +SUBDIRS = xml entities bin examples #htmldir = $(docdir)/html +EXTRA_DIST = ENV* -html_DATA = html -doc_DATA = pdf +#html_DATA = html +#doc_DATA = pdf -html: - $(MAKE) -C xml html +#html: +# $(MAKE) -C xml html -pdf: - $(MAKE) -C xml pdf +#pdf: +# $(MAKE) -C xml pdf pkgsrc: $(MAKE) -C xml pkgsrc -html-debug: - $(MAKE) -C xml pkgsrc +#html-debug: +# $(MAKE) -C xml pkgsrc bigfile: $(MAKE) -C xml ay_bigfile.xml Modified: trunk/autoinstallation/doc/xml/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/Makefil… ============================================================================== --- trunk/autoinstallation/doc/xml/Makefile.am (original) +++ trunk/autoinstallation/doc/xml/Makefile.am Thu Feb 2 11:54:14 2012 @@ -4,7 +4,7 @@ # $Id: Makefile.am 63765 2011-04-11 15:40:31Z ug $ # -SUBDIRS = images +SUBDIRS = images entities htmldir = $(docdir)/html xml_file = autoyast.xml @@ -22,8 +22,8 @@ STYLESHEET_CSS = default.css -html_DATA = html -doc_DATA = pdf +#html_DATA = html +#doc_DATA = pdf DAPS_BASE := $(shell readlink -f ..) @@ -35,21 +35,25 @@ #doc_DATA = autoyast.pdf -.PHONY: pdf html pkgsrc html-debug entities +#.PHONY: pdf html pkgsrc html-debug entities +.PHONY: html pkgsrc html-debug entities html: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml -html: RESULTDIR := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) html-dir-name 2>/dev/null) +html: RESULTDIR="..//build/autoyast/html/autoyast" +#html: RESULTDIR := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) html-dir-name 2>/dev/null) html: daps -e ENV-autoyast --basedir=$(DAPS_BASE) html --static rm -rf html && mkdir -p html cp -a $(RESULTDIR)/* html -pdf: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml -pdf: PDF_FILE := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) color-pdf-name 2>/dev/null) -pdf: - daps -e ENV-autoyast --basedir=$(DAPS_BASE) pdf-color - mkdir -p pdf - cp -a $(PDF_FILE) pdf +#pdf: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml +#pdf: PDF_FILE="..//build/autoyast/autoyast_en.pdf" +#pdf: PDF_FILE := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) color-pdf-name 2>/dev/null) +#pdf: +# daps -e ENV-autoyast --basedir=$(DAPS_BASE) pdf-color +# mkdir -p pdf +# echo "$(PDF_FILE) xxx" +# cp -a $(PDF_FILE) pdf pkgsrc: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml daps -e ENV-autoyast --basedir=$(DAPS_BASE) package-src @@ -77,7 +81,6 @@ # was: images/PNG/*.png prep-daps-images: mkdir -p ../images/src/png - cp -axu ../autoyast2/img/*.png ../images/src/png ay_bigfile_docbook.xml: autoyast.xml $(xml_files) prep-daps-images entities # Remove internal entity statements @@ -102,14 +105,16 @@ ay_bigfile.xml: ay_bigfile_docbook.xml xsltproc --output $@ \ - /usr/share/susedoc/xslt/misc/db2novdoc.xsl $< + /usr/share/daps/xslt/misc/db2novdoc.xsl $< -install-data-local: html pdf -install-data-local: PDF_FILE := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) color-pdf-name 2>/dev/null) +#install-data-local: html pdf +install-data-local: html +#install-data-local: PDF_FILE="..//build/autoyast/autoyast_en.pdf" +#install-data-local: PDF_FILE := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) color-pdf-name 2>/dev/null) install-data-local: install -d -m 755 $(DESTDIR)$(htmldir) cp -a $(srcdir)/html/* $(DESTDIR)$(htmldir) - cp -a $(srcdir)/$(shell basename $(PDF_FILE)) $(docdir) +# cp -a $(srcdir)/$(shell basename $(PDF_FILE)) $(docdir) # cp -a $(srcdir)/html/images $(DESTDIR)$(htmldir) # cp -a $(srcdir)/html/img $(DESTDIR)$(htmldir) # cp -a $(srcdir)/html/devel $(DESTDIR)$(htmldir) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67347 - /tags/branch-Linux-12_1-2_21_13/ldap-client/
by jsuchome＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: jsuchome Date: Thu Feb 2 09:44:06 2012 New Revision: 67347 URL: http://svn.opensuse.org/viewcvs/yast?rev=67347&view=rev Log: Created tag branch-Linux-12_1-2_21_13 for ldap-client Added: tags/branch-Linux-12_1-2_21_13/ldap-client/ - copied from r67346, branches/SuSE-Linux-12_1-Branch/ldap-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67346 - /tags/branch-Linux-12_1-2_21_13/
by jsuchome＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: jsuchome Date: Thu Feb 2 09:43:50 2012 New Revision: 67346 URL: http://svn.opensuse.org/viewcvs/yast?rev=67346&view=rev Log: Created tag branch-Linux-12_1-2_21_13 Added: tags/branch-Linux-12_1-2_21_13/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67345 - /tags/branch-Linux-12_1-2_21_6/kerberos-client/
by jsuchome＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: jsuchome Date: Thu Feb 2 09:33:55 2012 New Revision: 67345 URL: http://svn.opensuse.org/viewcvs/yast?rev=67345&view=rev Log: Created tag branch-Linux-12_1-2_21_6 for kerberos-client Added: tags/branch-Linux-12_1-2_21_6/kerberos-client/ - copied from r67344, branches/SuSE-Linux-12_1-Branch/kerberos-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67344 - in /branches/SuSE-Linux-12_1-Branch/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp
by jsuchome＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: jsuchome Date: Thu Feb 2 09:33:39 2012 New Revision: 67344 URL: http://svn.opensuse.org/viewcvs/yast?rev=67344&view=rev Log: - change mode of sssd.conf file after writing (workaround for ini-agent bnc#743355) - 2.21.13 Modified: branches/SuSE-Linux-12_1-Branch/ldap-client/VERSION branches/SuSE-Linux-12_1-Branch/ldap-client/package/yast2-ldap-client.changes branches/SuSE-Linux-12_1-Branch/ldap-client/src/Ldap.ycp Modified: branches/SuSE-Linux-12_1-Branch/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-12_1-Branch/ldap-c… ============================================================================== --- branches/SuSE-Linux-12_1-Branch/ldap-client/VERSION (original) +++ branches/SuSE-Linux-12_1-Branch/ldap-client/VERSION Thu Feb 2 09:33:39 2012 @@ -1 +1 @@ -2.21.12 +2.21.13 Modified: branches/SuSE-Linux-12_1-Branch/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-12_1-Branch/ldap-c… ============================================================================== --- branches/SuSE-Linux-12_1-Branch/ldap-client/package/yast2-ldap-client.changes (original) +++ branches/SuSE-Linux-12_1-Branch/ldap-client/package/yast2-ldap-client.changes Thu Feb 2 09:33:39 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 2 09:01:47 CET 2012 - jsuchome(a)suse.cz + +- change mode of sssd.conf file after writing (workaround for + ini-agent bnc#743355) +- 2.21.13 + +------------------------------------------------------------------- Wed Nov 16 15:31:30 CET 2011 - jsuchome(a)suse.cz - correctly handle sssd config with more LDAP servers (bnc#729174) Modified: branches/SuSE-Linux-12_1-Branch/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-12_1-Branch/ldap-c… ============================================================================== --- branches/SuSE-Linux-12_1-Branch/ldap-client/src/Ldap.ycp (original) +++ branches/SuSE-Linux-12_1-Branch/ldap-client/src/Ldap.ycp Thu Feb 2 09:33:39 2012 @@ -2213,9 +2213,10 @@ */ global boolean WriteSSSDConfig () { - if (!FileUtils::Exists ("/etc/sssd/sssd.conf")) + string file = "/etc/sssd/sssd.conf"; + if (!FileUtils::Exists (file)) { - y2warning ("file /etc/sssd/sssd.conf does not exists: not writing"); + y2warning ("file %1 does not exists: not writing", file); return false; } @@ -2278,8 +2279,13 @@ if (!SCR::Write(.etc.sssd_conf, nil)) { - y2error ("error writing ldap.conf file"); + y2error ("error writing %1 file", file); } + else + { + // workadound for ini-agent bug (bnc#743355) + SCR::Execute (.target.bash, sformat ("/bin/chmod 600 %1", file)); + } return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67343 - /tags/branch-Linux-12_1-2_21_6/
by jsuchome＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: jsuchome Date: Thu Feb 2 09:33:38 2012 New Revision: 67343 URL: http://svn.opensuse.org/viewcvs/yast?rev=67343&view=rev Log: Created tag branch-Linux-12_1-2_21_6 Added: tags/branch-Linux-12_1-2_21_6/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67342 - in /branches/SuSE-Linux-12_1-Branch/kerberos-client: VERSION package/yast2-kerberos-client.changes src/Kerberos.ycp
by jsuchome＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: jsuchome Date: Thu Feb 2 09:27:34 2012 New Revision: 67342 URL: http://svn.opensuse.org/viewcvs/yast?rev=67342&view=rev Log: - change mode of sssd.conf file after writing (workaround for ini-agent bnc#743355) - 2.21.6 Modified: branches/SuSE-Linux-12_1-Branch/kerberos-client/VERSION branches/SuSE-Linux-12_1-Branch/kerberos-client/package/yast2-kerberos-client.changes branches/SuSE-Linux-12_1-Branch/kerberos-client/src/Kerberos.ycp Modified: branches/SuSE-Linux-12_1-Branch/kerberos-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-12_1-Branch/kerber… ============================================================================== --- branches/SuSE-Linux-12_1-Branch/kerberos-client/VERSION (original) +++ branches/SuSE-Linux-12_1-Branch/kerberos-client/VERSION Thu Feb 2 09:27:34 2012 @@ -1 +1 @@ -2.21.5 +2.21.6 Modified: branches/SuSE-Linux-12_1-Branch/kerberos-client/package/yast2-kerberos-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-12_1-Branch/kerber… ============================================================================== --- branches/SuSE-Linux-12_1-Branch/kerberos-client/package/yast2-kerberos-client.changes (original) +++ branches/SuSE-Linux-12_1-Branch/kerberos-client/package/yast2-kerberos-client.changes Thu Feb 2 09:27:34 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 2 09:02:01 CET 2012 - jsuchome(a)suse.cz + +- change mode of sssd.conf file after writing (workaround for + ini-agent bnc#743355) +- 2.21.6 + +------------------------------------------------------------------- Wed Nov 16 15:44:20 CET 2011 - jsuchome(a)suse.cz - correctly handle sssd config with more LDAP servers (bnc#729174) Modified: branches/SuSE-Linux-12_1-Branch/kerberos-client/src/Kerberos.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-12_1-Branch/kerber… ============================================================================== --- branches/SuSE-Linux-12_1-Branch/kerberos-client/src/Kerberos.ycp (original) +++ branches/SuSE-Linux-12_1-Branch/kerberos-client/src/Kerberos.ycp Thu Feb 2 09:27:34 2012 @@ -508,8 +508,13 @@ SCR::Write (add (domain, "krb5_kdcip"), krb5_kdcip); if (!SCR::Write(.etc.sssd_conf, nil)) { - y2error ("error writing ldap.conf file"); + y2error ("error writing sssd.conf file"); } + else + { + // workadound for ini-agent bug (bnc#743355) + SCR::Execute (.target.bash, "/bin/chmod 600 /etc/sssd/sssd.conf"); + } } else if (use_pam_krb) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67341 - in /trunk/iscsi-client: package/yast2-iscsi-client.changes src/IscsiClientLib.ycp
by fehr＠svn2.opensuse.org 01 Feb '12

01 Feb '12

Author: fehr Date: Wed Feb 1 19:31:58 2012 New Revision: 67341 URL: http://svn.opensuse.org/viewcvs/yast?rev=67341&view=rev Log: create /etc/iscsi to prevent crash if nonexistant (bnc#742570) Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/IscsiClientLib.ycp Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Wed Feb 1 19:31:58 2012 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Mon Jan 30 19:14:16 CET 2012 - fehr(a)suse.de +- create /etc/iscsi to prevent crash if nonexistant (bnc#742570) - prevent calling getiBFT() before open-iscsi install (bnc#725833) ------------------------------------------------------------------- Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.… ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Wed Feb 1 19:31:58 2012 @@ -321,6 +321,12 @@ global boolean writeInitiatorName(string new_value){ boolean ret=true; string file="/etc/iscsi/initiatorname.iscsi"; + string dir="/etc/iscsi"; + if( (map)SCR::Read (.target.stat, dir )==$[] ) + { + SCR::Execute(.target.mkdir, dir ); + y2milestone( "writeInitiatorName dir:%1", SCR::Read(.target.stat, dir )); + } if ( ((map<string, any>)SCR::Read (.target.lstat, file))["size"]:0>0 ) { y2milestone("%1 file exists, create backup", file); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67340 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-client: package/yast2-iscsi-client.changes src/IscsiClientLib.ycp
by fehr＠svn2.opensuse.org 01 Feb '12

01 Feb '12

Author: fehr Date: Wed Feb 1 19:30:22 2012 New Revision: 67340 URL: http://svn.opensuse.org/viewcvs/yast?rev=67340&view=rev Log: create /etc/iscsi to prevent crash if nonexistant (bnc#742570) Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes Wed Feb 1 19:30:22 2012 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Mon Jan 30 19:14:16 CET 2012 - fehr(a)suse.de +- create /etc/iscsi to prevent crash if nonexistant (bnc#742570) - prevent calling getiBFT() before open-iscsi install (bnc#725833) ------------------------------------------------------------------- Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Wed Feb 1 19:30:22 2012 @@ -321,6 +321,12 @@ global boolean writeInitiatorName(string new_value){ boolean ret=true; string file="/etc/iscsi/initiatorname.iscsi"; + string dir="/etc/iscsi"; + if( (map)SCR::Read (.target.stat, dir )==$[] ) + { + SCR::Execute(.target.mkdir, dir ); + y2milestone( "writeInitiatorName dir:%1", SCR::Read(.target.stat, dir )); + } if ( ((map<string, any>)SCR::Read (.target.lstat, file))["size"]:0>0 ) { y2milestone("%1 file exists, create backup", file); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67339 - in /trunk/autoinstallation: VERSION package/autoyast2.changes
by ug＠svn2.opensuse.org 01 Feb '12

01 Feb '12

Author: ug Date: Wed Feb 1 16:28:28 2012 New Revision: 67339 URL: http://svn.opensuse.org/viewcvs/yast?rev=67339&view=rev Log: 2.22.0 Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/package/autoyast2.changes Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=673… ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Wed Feb 1 16:28:28 2012 @@ -1 +1 @@ -2.21.4 +2.22.0 Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Feb 1 16:28:28 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 1 16:28:04 CET 2012 - ug(a)suse.de + +- 2.22.0 + +------------------------------------------------------------------- Wed Jan 4 15:51:41 CET 2012 - ug(a)suse.de - added taboo list for device guessing -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67338 - in /trunk/ncurses/src: NCRichText.cc NCRichText.h
by gs＠svn2.opensuse.org 01 Feb '12

01 Feb '12

Author: gs Date: Wed Feb 1 13:23:51 2012 New Revision: 67338 URL: http://svn.opensuse.org/viewcvs/yast?rev=67338&view=rev Log: ignore <tt> tag, interpret html tags inside <pre> (bnc #724119) Modified: trunk/ncurses/src/NCRichText.cc trunk/ncurses/src/NCRichText.h Modified: trunk/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.cc?rev=67… ============================================================================== --- trunk/ncurses/src/NCRichText.cc (original) +++ trunk/ncurses/src/NCRichText.cc Wed Feb 1 13:23:51 2012 @@ -344,36 +344,32 @@ } } - -void NCRichText::PadPlainTXT( const wchar_t * osch, const unsigned olen ) +void NCRichText::PadPreTXT( const wchar_t * osch, const unsigned olen ) { wstring wtxt( osch, olen ); + // resolve the entities even in PRE (#71718) wtxt = filterEntities( wtxt ); - + NCstring nctxt( wtxt ); NCtext ftext( nctxt ); - if ( ftext.Columns() > textwidth ) - textwidth = ftext.Columns(); - - AdjustPad( wsze( cl + ftext.Lines(), textwidth ) ); + int len = textWidth( wtxt ); + if ( cc + len > textwidth ) + { + textwidth = cc + len; + AdjustPad( wsze(cl+ftext.Lines(), textwidth) ); + } + // insert the text const wchar_t * sch = wtxt.data(); while ( *sch ) { - if ( *sch != L'\r' ) // skip carriage return - { - myPad()->addwstr( sch, 1 ); // add one wide chararacter - cc += wcwidth( *sch ); + myPad()->addwstr( sch, 1 ); // add one wide chararacter + cc += wcwidth( *sch ); - if ( *sch == L'\n' ) - { - PadNL(); // add a new line - } - } ++sch; } } @@ -420,17 +416,16 @@ while ( *wch && WDtoken.find( *wch ) == wstring::npos ); } +static wstring PREtoken( L"<\n\v\r" ); // line manipulations + TokenStart '<' + inline void SkipPreTXT( const wchar_t *& wch ) { - wstring wstr( wch, 6 ); - do { ++wch; - wstr.assign( wch, 6 ); } - while ( *wch && wstr != L"</pre>" ); + while ( *wch && PREtoken.find( *wch ) == wstring::npos ); } @@ -483,16 +478,14 @@ break; case L'<': - if ( !preTag ) - { - swch = wch; - SkipToken( wch ); + swch = wch; + SkipToken( wch ); + + if ( PadTOKEN( swch, wch ) ) + break; // strip token + else + wch = swch; // reset and fall through - if ( PadTOKEN( swch, wch ) ) - break; // strip token - else - wch = swch; // reset and fall through - } default: swch = wch; @@ -504,9 +497,7 @@ else { SkipPreTXT( wch ); - PadPlainTXT( swch, wch - swch ); - preTag = false; - PadNL(); // add new line after pre is closed + PadPreTXT( swch, wch - swch ); } break; @@ -515,6 +506,7 @@ PadBOL(); AdjustPad( wsze( cl, textwidth ) ); + yuiMilestone() << "adjust: lines: " << cl << " columns: " << textwidth << endl; yuiDebug() << "Anchors: " << anchors.size() << endl; for ( unsigned i = 0; i < anchors.size(); ++i ) @@ -841,7 +833,7 @@ else if ( value == L"li" ) token = T_LI; else if ( value == L"ol" ) { token = T_LEVEL; leveltag = 1; } else if ( value == L"qt" ) token = T_IGNORE; - else if ( value == L"tt" ) token = T_TT; + else if ( value == L"tt" ) token = T_IGNORE; else if ( value == L"ul" ) { token = T_LEVEL; leveltag = 0; } break; @@ -981,11 +973,12 @@ if ( !endtag ) { - preTag = true; // display plain text + preTag = true; // display text preserving newlines and spaces } else { preTag = false; + PadNL(); // add new line after pre } break; Modified: trunk/ncurses/src/NCRichText.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.h?rev=673… ============================================================================== --- trunk/ncurses/src/NCRichText.h (original) +++ trunk/ncurses/src/NCRichText.h Wed Feb 1 13:23:51 2012 @@ -91,8 +91,7 @@ unsigned cindent; bool atbol; - bool preTag; // default is false; set true - // if <pre> tag is found + bool preTag; // <pre> tag unsigned Tattr; @@ -212,7 +211,7 @@ void PadBOL(); void PadWS( const bool tab = false ); void PadTXT( const wchar_t * sch, const unsigned len ); - void PadPlainTXT( const wchar_t * sch, const unsigned len ); + void PadPreTXT( const wchar_t * sch, const unsigned len ); bool PadTOKEN( const wchar_t * sch, const wchar_t *& ech ); protected: -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67337 - in /branches/SuSE-Code-11-SP1-Branch/bootloader: VERSION package/yast2-bootloader.changes src/modules/BootCommon.ycp src/modules/Bootloader.ycp src/routines/misc.ycp
by snwint＠svn2.opensuse.org 01 Feb '12

01 Feb '12

Author: snwint Date: Wed Feb 1 11:48:50 2012 New Revision: 67337 URL: http://svn.opensuse.org/viewcvs/yast?rev=67337&view=rev Log: - fix default menu entry detection in zipl.conf (bnc #740324) Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION Wed Feb 1 11:48:50 2012 @@ -1 +1 @@ -2.17.85 +2.17.86 Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Wed Feb 1 11:48:50 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 27 14:58:43 CET 2012 - snwint(a)suse.de + +- fix default menu entry detection (bnc #740324) +- 2.17.86 + +------------------------------------------------------------------- Fri Jan 13 15:48:55 CET 2012 - snwint(a)suse.de - really update bootloader sections after device renaming (bnc #727310) Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp Wed Feb 1 11:48:50 2012 @@ -440,6 +440,8 @@ global string addMDSettingsToGlobals (); global boolean VerifyMDArray (); +// zipl.conf has its own idiosyncrasies when it comes to default entries +global string checkZiplDefault (string def); // // FIXME: the select and selectdevice seem to be broken: the default value of @@ -1555,6 +1557,69 @@ return ret; } +/** bnc #364904 + * Function parse zipl list names if default section is menu + * + * @param string (string) list of names + * @param string position of default name in list + * @return string name of default section from list + */ +string parseListDefault(string names, string position) +{ + string ret = ""; + + y2milestone("section names (string) list: %1 and default name position in list: %2", names, position); + if ((names == "") || (position == "")) + return ret; + + if (search(names, ",") != nil) + { + string tmp_names = deletechars(names, " "); + list <string> list_names = splitstring(tmp_names, ","); + ret = list_names[(tointeger(position)-1)]:""; + } else { + ret = names; + } + + return ret; +} + +/** bnc #364904 + * Function check if default section is menu + * if yes it tries to find default section in + * list of names from menu section + * + * @param string name of default BootCommon::globals["default"]:"" + * @return string name of default section + */ + +global string checkZiplDefault(string def) +{ + string def_section_name = def; + + if (getLoaderType (false) == "zipl") + { + foreach(map<string,any> section, BootCommon::sections, + { + if (section["name"]:"" == def_section_name) + { + if (section["type"]:"" == "menu") + { + string def_position = section["default"]:""; + def_section_name = parseListDefault(section["list"]:"", def_position); + + } else { + break; + } + } + }); + + } + + y2milestone("name of default section: %1", def_section_name); + return def_section_name; +} + } /* Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp Wed Feb 1 11:48:50 2012 @@ -1035,76 +1035,13 @@ y2milestone("sections after remapping: %1", BootCommon::sections); } -/** bnc #364904 - * Function parse zipl list names if default section is menu - * - * @param string (string) list of names - * @param string position of default name in list - * @return string name of default section from list - */ -string parseListDefault(string names, string position) -{ - string ret = ""; - - y2milestone("section names (string) list: %1 and default name position in list: %2", names, position); - if ((names == "") || (position == "")) - return ret; - - if (search(names, ",") != nil) - { - string tmp_names = deletechars(names, " "); - list <string> list_names = splitstring(tmp_names, ","); - ret = list_names[(tointeger(position)-1)]:""; - } else { - ret = names; - } - - return ret; -} - -/** bnc #364904 - * Function check if default section is menu - * if yes it tries to find default section in - * list of names from menu section - * - * @param string name of default BootCommon::globals["default"]:"" - * @return string name of default section - */ - -string checkZiplDefault(string def) -{ - string def_section_name = def; - - if (getLoaderType () == "zipl") - { - foreach(map<string,any> section, BootCommon::sections, - { - if (section["name"]:"" == def_section_name) - { - if (section["type"]:"" == "menu") - { - string def_position = section["default"]:""; - def_section_name = parseListDefault(section["list"]:"", def_position); - - } else { - break; - } - } - }); - - } - - y2milestone("name of default section: %1", def_section_name); - return def_section_name; -} - /** * return default section label * @return string default section label */ global define string getDefaultSection () { ReadOrProposeIfNeeded (); - string default_name = checkZiplDefault(BootCommon::globals["default"]:""); + string default_name = BootCommon::checkZiplDefault(BootCommon::globals["default"]:""); return default_name; } Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp Wed Feb 1 11:48:50 2012 @@ -2431,10 +2431,11 @@ // fix for bnc #440125 - default boot section with failsafe args // it is not possible create exact algoritmus but I hope it helps in // mostly cases. - if (isDefaultBootSectioLinux(BootCommon::globals["default"]:"")) - default_boot_section_name = BootCommon::globals["default"]:""; - else + default_boot_section_name = BootCommon::checkZiplDefault(BootCommon::globals["default"]:""); + if (!isDefaultBootSectioLinux(default_boot_section_name)) + { default_boot_section_name = findRelativeDefaultLinux (); + } // get the default and failsafe append + vga parameters; if section with // appropriate original name not found, just use any Linux section -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0