
Hello community, here is the log from the commit of package yast2 checked in at Fri May 4 11:19:57 CEST 2007. -------- --- yast2/yast2.changes 2007-04-19 16:32:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2007-05-03 23:28:21.861629000 +0200 @@ -1,0 +2,12 @@ +Thu May 3 14:44:05 CEST 2007 - varkoly@suse.de + +- Add new modul file MailAlias.ycp (269867 - build cycle between yast2-users and yast2-mail) +- 2.15.31 + +------------------------------------------------------------------- +Thu May 3 14:20:41 CEST 2007 - locilka@suse.cz + +- Present more information to the user when calling a YaST client + fails (#267886). + +------------------------------------------------------------------- Old: ---- yast2-2.15.29.tar.bz2 New: ---- yast2-2.15.31.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.h11674/_old 2007-05-04 11:18:48.000000000 +0200 +++ /var/tmp/diff_new_pack.h11674/_new 2007-05-04 11:18:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.15.29) +# spec file for package yast2 (Version 2.15.31) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2 -Version: 2.15.29 -Release: 2 +Version: 2.15.31 +Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.15.29.tar.bz2 +Source0: yast2-2.15.31.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite # SCR::RegisterNewAgents() @@ -101,7 +101,7 @@ Steffen Winterfeldt <snwint@suse.de> %prep -%setup -n yast2-2.15.29 +%setup -n yast2-2.15.31 %build %{prefix}/bin/y2tool y2autoconf @@ -209,6 +209,12 @@ %doc %{prefix}/share/doc/packages/yast2/wizard %changelog +* Thu May 03 2007 - varkoly@suse.de +- Add new modul file MailAlias.ycp (269867 - build cycle between yast2-users and yast2-mail) +- 2.15.31 +* Thu May 03 2007 - locilka@suse.cz +- Present more information to the user when calling a YaST client + fails (#267886). * Thu Apr 19 2007 - mzugec@suse.cz - added GetIP(device) function to get first+additional addresses (#264393) - 2.15.30 ++++++ yast2-2.15.29.tar.bz2 -> yast2-2.15.31.tar.bz2 ++++++ ++++ 10673 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-2.15.29/configure.in new/yast2-2.15.31/configure.in --- old/yast2-2.15.29/configure.in 2007-04-19 16:22:54.000000000 +0200 +++ new/yast2-2.15.31/configure.in 2007-05-03 14:53:42.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2 dnl -dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.15.29, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.15.31, http://bugs.opensuse.org/, yast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.29" +VERSION="2.15.31" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain@suse.cz>" @@ -120,8 +120,6 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` -AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -154,9 +152,6 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi -AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ - AC_MSG_WARN([yast2-testsuite.rpm is not installed]) -]) dnl Check packages expect and dejagnu AC_PATH_PROG(MYEXPECT, expect, false) 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-2.15.29/library/control/src/ProductControl.ycp new/yast2-2.15.31/library/control/src/ProductControl.ycp --- old/yast2-2.15.29/library/control/src/ProductControl.ycp 2007-04-17 13:29:26.000000000 +0200 +++ new/yast2-2.15.31/library/control/src/ProductControl.ycp 2007-05-03 14:35:53.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Product Control routines * Authors: Anas Nashif <nashif@suse.de> * - * $Id: ProductControl.ycp 37358 2007-04-06 13:36:55Z locilka $ + * $Id: ProductControl.ycp 37799 2007-05-03 12:24:10Z locilka $ */ { textdomain "base"; @@ -980,7 +980,25 @@ } any r = nil; - r = Popup::ModuleError(sformat("The module %1 does not work.", symbolof(argterm))); + r = Popup::ModuleError ( + sformat ( + // TRANSLATORS: an error message + // this should not happen, but life is cruel... + // %1 - (failed) module name + // %2 - logfile, possibly with errors + // %3 - link to our bugzilla + // %4 - directory where YaST logs are stored + "Calling the YaST module %1 has failed. +More information can be found near the end of the '%2' file. + +This is worth reporting a bug at %3. +Please, attach also all YaST logs stored in the '%4' directory.", + symbolof (argterm), + "/var/log/YaST2/y2log", + "http://bugzilla.novell.com/", + "/var/log/YaST2/" + ) + ); if (r == `next) current_step = current_step + 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-2.15.29/library/modules/MailAliases.ycp new/yast2-2.15.31/library/modules/MailAliases.ycp --- old/yast2-2.15.29/library/modules/MailAliases.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.15.31/library/modules/MailAliases.ycp 2007-03-21 12:03:10.000000000 +0100 @@ -0,0 +1,211 @@ +/** + * File: + * modules/Mail.ycp + * + * Package: + * Configuration of mail aliases + * + * Summary: + * Data for configuration of mail aliases, input and output functions. + * + * Authors: + * Martin Vidner <mvidner@suse.cz> + * + * $Id: MailAliases.ycp 35035 2007-01-02 14:35:30Z mvidner $ + * + * Representation of the configuration of mail aliases. + * Input and output routines. + * Separated from Mail.ycp because yast2-users need us. + * Virtusertable/virtual users are not included, arbitrarily. + * + */ + +{ + // Set the name of the module + module "MailAliases"; + + // no translatable strings, no textdomain. + import "MailTable"; + + /* ---------------------------------------------------------------- */ + + /** + * List of maps: $[comment:, alias:, destinations:] (all are strings) + * Except root. + */ + global list<map> aliases = []; + /** + * Separated/joined with aliases by read/write/set/export + */ + global string root_alias = ""; + /** + * Separated/joined with aliases by read/write/set/export + */ + string root_alias_comment = ""; + + /** + * Useful for autoinstall: the provided aliases will be (with + * higher priority) merged with existing ones (presumably system defaults). + */ +// global boolean merge_aliases = false; + + /* ---------------------------------------------------------------- */ + + /** + * Separates aliases into aliases, root_alias and root_alias_comment + */ + global define void FilterRootAlias () ``{ + root_alias = ""; + root_alias_comment = ""; + aliases = filter (map e, aliases, ``{ + if (e["alias"]:"" == "root" ) + { + root_alias = e["destinations"]:""; + root_alias_comment = e["comment"]:""; + return false; + } + return true; + }); + } + + /** + * Read the aliases table (and separate the root alias) + * @return success? + */ + global define boolean ReadAliases () ``{ + list<map> a_raw = MailTable::Read ("aliases"); + aliases = maplist (map e, a_raw, + ``($[ + "comment" : e["comment"]: "", + "alias" : e["key"]: "", + "destinations" : e["value"]: "", + ])); + FilterRootAlias (); + return true; + } + + /** + * @param aliases an alias table + * @return prepend root alias data to aliases, if set + */ + global define list<map> MergeRootAlias (list<map> aliases) ``{ + list<map> ret = aliases; + if (root_alias != "") + { + ret = prepend (ret, $[ + "alias": "root", + "destinations": root_alias, + "comment": root_alias_comment, + ]); + } + return ret; + } + + /* ---------------------------------------------------------------- */ + + /** + * Merges mail tables, which are order-preserving maps. + * First are the entries of the old map, with values updated + * from the new one, then the rest of the new map. + * @param new new table + * @param old old table + * @return merged table + */ + define list<map> mergeTables (list<map> new, list<map> old) ``{ + // make a true map + map new_m = listmap (map e, new, + ``($[ + e["key"]:"" : + [ e["comment"]:"", e["value"]:"" ] + ])); + // update old values + list<map> replaced = maplist (map e, old, ``{ + string k = e["key"]:""; + list cv = new_m[k]:[]; + if (size (cv) > 0) + { + new_m[k] = []; // ok, newly constructed + return $["key": k, "comment": cv[0]:"", "value": cv[1]:""]; + } + else + { + return $["key": k, "comment": e["comment"]:"", "value": e["value"]:""]; + } + }); + // remove already updated values + list<map> filtered = filter (map e, new, ``( + size (new_m[ e["key"]:"" ]:[]) > 0) + ); + return flatten ([replaced, filtered]); + } + + /** + * Part of Write. + * @return success + * @see SetRootAlias + */ + global define boolean WriteAliases () ``{ + // aliases + string alias_path = "aliases"; + list<map> a_raw = maplist (map e, MergeRootAlias (aliases), + ``($[ + "comment" : e["comment"]:"", + "key" : e["alias"]:"", + "value" : e["destinations"]:"", + ])); +// if (merge_aliases) +// { +// a_raw = mergeTables (a_raw, MailTable::Read (alias_path)); +// } + MailTable::Write ("aliases", a_raw); + return true; + } + + + /* ---------------------------------------------------------------- */ + + /** + * For use by the Users package. + * Does not rely on the internal state, first calls the agent. + * @return eg. "joe, \\root", "" if not defined + */ + global define string GetRootAlias () ``{ + if (!ReadAliases ()) + { + return ""; + } + return root_alias; + } + + + /** + * For use by the Users package. + * Does not use the internal state, just calls the agent. + * SuSEconfig or newaliases is NOT called! + * (TODO: what if it is called while the main module is running?) + * Errors are reported via Report::Error. + * @param destinations The new alias. If "", it is removed. + * @return true on success + */ + global define boolean SetRootAlias (string destinations) ``{ + if (!ReadAliases ()) + { + return false; + } + + root_alias = destinations; + root_alias_comment = ""; // TODO: "created by the ... yast2 module"? + + if (!WriteAliases ()) + { + return false; + } + + if (! MailTable::Flush ("aliases")) + { + return false; + } + return true; + } + +} 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-2.15.29/library/modules/Version.ycp new/yast2-2.15.31/library/modules/Version.ycp --- old/yast2-2.15.29/library/modules/Version.ycp 2007-04-19 16:23:12.000000000 +0200 +++ new/yast2-2.15.31/library/modules/Version.ycp 2007-05-03 14:54:04.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.15.29"; +global string yast2 = "2.15.31"; /* EOF */ } 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-2.15.29/library/network/src/NetworkDevices.ycp new/yast2-2.15.31/library/network/src/NetworkDevices.ycp --- old/yast2-2.15.29/library/network/src/NetworkDevices.ycp 2007-04-19 15:56:14.000000000 +0200 +++ new/yast2-2.15.31/library/network/src/NetworkDevices.ycp 2007-05-02 08:31:35.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Interface manipulation (/etc/sysconfig/network/ifcfg-*) * Authors: Michal Svec <msvec@suse.cz> * - * $Id: NetworkDevices.ycp 36864 2007-03-12 10:53:15Z mzugec $ + * $Id: NetworkDevices.ycp 37596 2007-04-19 14:31:58Z mzugec $ * * The new sysconfig naming is interface (eg. eth0) vs. device * (eg. NE2000 card), but historically yast has called them device 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-2.15.29/library/types/src/String.ycp new/yast2-2.15.31/library/types/src/String.ycp --- old/yast2-2.15.29/library/types/src/String.ycp 2007-03-12 09:51:38.000000000 +0100 +++ new/yast2-2.15.31/library/types/src/String.ycp 2007-05-02 08:31:36.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: String manipulation routines * Authors: Michal Svec <msvec@suse.cz> * - * $Id: String.ycp 36213 2007-02-16 12:02:08Z lslezak $ + * $Id: String.ycp 37626 2007-04-20 13:20:26Z arvin $ */ { @@ -14,6 +14,10 @@ /** * Quote a string with 's + * + * More precisely it protects single quotes inside the string but does not + * prepend or append single quotes. + * * @param var unquoted string * @return quoted string * @example quote("a'b") -> "a'\''b" @@ -73,7 +77,7 @@ /** * Return a pretty description of a byte count - * + * * Return a pretty description of a byte count with required precision * and using KB, MB or GB as unit as appropriate. * @@ -234,7 +238,7 @@ } /** - * Add zeros before the text to make it long enough. + * Add zeros before the text to make it long enough. * * Add zeros before the text to make it long enough. If the text is longer * than requested, no changes are made. @@ -749,7 +753,7 @@ underline = underline + base_underline; } underline = substring(underline, 0, length); - + return underline; } @@ -831,7 +835,7 @@ * @return string underlined header line */ global define string UnderlinedHeader (string header_line, integer left_padding) { - + return Pad("", left_padding) + header_line + "\n" + Pad("", left_padding) + CreateUnderline(size(header_line)); 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-2.15.29/Makefile.am new/yast2-2.15.31/Makefile.am --- old/yast2-2.15.29/Makefile.am 2007-04-19 16:22:54.000000000 +0200 +++ new/yast2-2.15.31/Makefile.am 2007-05-03 14:53:42.000000000 +0200 @@ -7,7 +7,8 @@ # #where devtools are -Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool +PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -19,7 +20,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -33,7 +34,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common @@ -66,7 +67,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -$(RPMNAME).pc: $(RPMNAME).pc.in config.status +$(RPMNAME).pc: $(RPMNAME).pc.in ./config.status --file=$@:$< if CREATE_PKGCONFIG_NOARCH 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-2.15.29/Makefile.am.common new/yast2-2.15.31/Makefile.am.common --- old/yast2-2.15.29/Makefile.am.common 2007-04-19 16:22:54.000000000 +0200 +++ new/yast2-2.15.31/Makefile.am.common 2007-05-03 14:53:42.000000000 +0200 @@ -29,19 +29,7 @@ dist-hook: check-syntax -CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - @if test "$(client_DATA)"; then \ - if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ - 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"; \ - exit 1; \ - fi; \ - else \ - echo "Syntax check disabled"; \ - fi; \ - fi + if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; 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-2.15.29/VERSION new/yast2-2.15.31/VERSION --- old/yast2-2.15.29/VERSION 2007-04-19 15:41:21.000000000 +0200 +++ new/yast2-2.15.31/VERSION 2007-05-03 14:44:01.000000000 +0200 @@ -1 +1 @@ -2.15.29 +2.15.31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de