Hello community, here is the log from the commit of package yast2-add-on-creator checked in at Wed Oct 3 17:10:02 CEST 2007. -------- --- yast2-add-on-creator/yast2-add-on-creator.changes 2007-09-14 10:02:38.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-add-on-creator/yast2-add-on-creator.changes 2007-10-03 14:41:04.919611000 +0200 @@ -1,0 +2,8 @@ +Mon Oct 1 11:23:59 CEST 2007 - jsuchome@suse.cz + +- create patterns with correct key ordering (#328816) +- after pattern import, show also keys without value (#329738) +- remember patter import path (#329731) +- 2.16.0 + +------------------------------------------------------------------- Old: ---- yast2-add-on-creator-2.15.21.tar.bz2 New: ---- yast2-add-on-creator-2.16.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on-creator.spec ++++++ --- /var/tmp/diff_new_pack.g11850/_old 2007-10-03 17:09:56.000000000 +0200 +++ /var/tmp/diff_new_pack.g11850/_new 2007-10-03 17:09:56.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-add-on-creator (Version 2.15.21) +# spec file for package yast2-add-on-creator (Version 2.16.0) # # 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-add-on-creator -Version: 2.15.21 +Version: 2.16.0 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-add-on-creator-2.15.21.tar.bz2 +Source0: yast2-add-on-creator-2.16.0.tar.bz2 Prefix: /usr Requires: yast2 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite @@ -33,7 +33,7 @@ Jiř� Suchomel <jsuchome@suse.cz> %prep -%setup -n yast2-add-on-creator-2.15.21 +%setup -n yast2-add-on-creator-2.16.0 %build %{prefix}/bin/y2tool y2autoconf @@ -68,8 +68,12 @@ /usr/share/YaST2/scrconf/*.scr /usr/lib/YaST2/servers_non_y2/ag_* %doc %{prefix}/share/doc/packages/yast2-add-on-creator - %changelog +* Mon Oct 01 2007 - jsuchome@suse.cz +- create patterns with correct key ordering (#328816) +- after pattern import, show also keys without value (#329738) +- remember patter import path (#329731) +- 2.16.0 * Fri Sep 14 2007 - jsuchome@suse.cz - enable deleting of pattern keys (#297195) - enable reading compressed metadata files ++++++ yast2-add-on-creator-2.15.21.tar.bz2 -> yast2-add-on-creator-2.16.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.21/src/add-on-creator.ycp new/yast2-add-on-creator-2.16.0/src/add-on-creator.ycp --- old/yast2-add-on-creator-2.15.21/src/add-on-creator.ycp 2007-09-13 23:21:00.000000000 +0200 +++ new/yast2-add-on-creator-2.16.0/src/add-on-creator.ycp 2007-09-14 10:02:59.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Main file * Authors: Jiri Suchomel <jsuchome@suse.cz> * - * $Id: add-on-creator.ycp 40167 2007-08-10 10:56:18Z jsuchome $ + * $Id: add-on-creator.ycp 40904 2007-09-14 08:02:58Z jsuchome $ * * Main file for add-on-creator configuration. Uses all other files. */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.21/src/AddOnCreator.ycp new/yast2-add-on-creator-2.16.0/src/AddOnCreator.ycp --- old/yast2-add-on-creator-2.15.21/src/AddOnCreator.ycp 2007-09-14 08:38:46.000000000 +0200 +++ new/yast2-add-on-creator-2.16.0/src/AddOnCreator.ycp 2007-10-03 14:18:17.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: AddOnCreator settings, input and output functions * Authors: Jiri Suchomel <jsuchome@suse.cz> * - * $Id: AddOnCreator.ycp 40432 2007-08-23 12:45:45Z jsuchome $ + * $Id: AddOnCreator.ycp 40904 2007-09-14 08:02:58Z jsuchome $ * * Representation of the configuration of add-on-creator. * Input and output routines. @@ -260,7 +260,7 @@ // desctiption of pattern keys -global map pattern_descr = $[ +global map<string,map> pattern_descr = $[ "name" : $[ "internal" : true, ], @@ -873,6 +873,15 @@ else ret[key] = val; }); + foreach (string key, map descr, pattern_descr, { + if (!haskey (ret, key) && !descr["internal"]:false) + { + y2debug ("adding empty key '%1'...", key); + // do not add default values - maybe imported pattern + // ignored them intentionally + ret[key] = ""; + } + }); return ret; } @@ -1563,7 +1572,10 @@ if (filename == "") return; names = add (names, filename); - string file = ""; + string file = sformat ("=Ver: %1\n\n=Pat: %2\n", + pattern["Ver"]:pattern_descr["Ver","defval"]:"", + pattern["Pat"]:""); + pattern = remove (remove (pattern, "Ver"), "Pat"); foreach (string key, any val, (map<string,any>) pattern, { map descr = pattern_descr[key]:$[]; // substring (key,0,3) is because of Des.lang, Sum.lang and Cat.lang diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.21/src/complex.ycp new/yast2-add-on-creator-2.16.0/src/complex.ycp --- old/yast2-add-on-creator-2.15.21/src/complex.ycp 2007-09-13 23:21:44.000000000 +0200 +++ new/yast2-add-on-creator-2.16.0/src/complex.ycp 2007-09-14 10:02:59.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Dialogs definitions * Authors: Jiri Suchomel <jsuchome@suse.cz> * - * $Id: complex.ycp 40432 2007-08-23 12:45:45Z jsuchome $ + * $Id: complex.ycp 40904 2007-09-14 08:02:58Z jsuchome $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.21/src/patterns.ycp new/yast2-add-on-creator-2.16.0/src/patterns.ycp --- old/yast2-add-on-creator-2.15.21/src/patterns.ycp 2007-09-05 12:56:09.000000000 +0200 +++ new/yast2-add-on-creator-2.16.0/src/patterns.ycp 2007-10-03 14:27:55.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs for patterns and selections * Authors: Jiri Suchomel <jsuchome@suse.cz> * - * $Id: patterns.ycp 38455 2007-06-14 12:23:24Z jsuchome $ + * $Id: patterns.ycp 40904 2007-09-14 08:02:58Z jsuchome $ */ { @@ -179,6 +179,7 @@ map<string,map> patterns = AddOnCreator::patterns; string requires = AddOnCreator::content_map["REQUIRES"]:""; + string import_path = AddOnCreator::rpm_path; // helper for generation of table items list get_pattern_items (map pattern) { @@ -279,8 +280,7 @@ } } else if (ret == `import_pt) { - string file = UI::AskForExistingFile ( - AddOnCreator::rpm_path, "*.pat", + string file = UI::AskForExistingFile (import_path, "*.pat", // popup for file selection dialog _("Existing Pattern") ); @@ -300,6 +300,7 @@ get_patterns_items()); UI::ChangeWidget(`id(`patterns), `CurrentItem, name); } + import_path = file; } } else if (ret == `delete_pt) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.21/VERSION new/yast2-add-on-creator-2.16.0/VERSION --- old/yast2-add-on-creator-2.15.21/VERSION 2007-09-14 08:40:18.000000000 +0200 +++ new/yast2-add-on-creator-2.16.0/VERSION 2007-10-03 14:28:24.000000000 +0200 @@ -1 +1 @@ -2.15.21 +2.16.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org