Hello community,
here is the log from the commit of package yast2-add-on-creator
checked in at Mon Oct 13 17:10:38 CEST 2008.
--------
--- yast2-add-on-creator/yast2-add-on-creator.changes 2008-09-09 11:09:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-add-on-creator/yast2-add-on-creator.changes 2008-10-13 16:36:05.668892000 +0200
@@ -1,0 +2,6 @@
+Mon Oct 13 16:27:48 CEST 2008 - jsuchome@suse.cz
+
+- removed obsoleted keys from content file (fate#305172)
+- 2.17.5
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-add-on-creator-2.17.4.tar.bz2
New:
----
yast2-add-on-creator-2.17.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-add-on-creator.spec ++++++
--- /var/tmp/diff_new_pack.IR3549/_old 2008-10-13 17:10:16.000000000 +0200
+++ /var/tmp/diff_new_pack.IR3549/_new 2008-10-13 17:10:16.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-add-on-creator (Version 2.17.4)
+# spec file for package yast2-add-on-creator (Version 2.17.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-add-on-creator
-Version: 2.17.4
+Version: 2.17.5
Release: 1
License: GPL v2 only; GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-add-on-creator-2.17.4.tar.bz2
+Source0: yast2-add-on-creator-2.17.5.tar.bz2
Prefix: /usr
PreReq: %fillup_prereq
Requires: yast2
@@ -42,7 +42,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-add-on-creator-2.17.4
+%setup -n yast2-add-on-creator-2.17.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -82,6 +82,9 @@
%doc %{prefix}/share/doc/packages/yast2-add-on-creator
/var/adm/fillup-templates/sysconfig.add-on-creator
%changelog
+* Mon Oct 13 2008 jsuchome@suse.cz
+- removed obsoleted keys from content file (fate#305172)
+- 2.17.5
* Tue Sep 09 2008 jsuchome@suse.cz
- merged proofread texts
- removed some obsoleted content file keys
++++++ yast2-add-on-creator-2.17.4.tar.bz2 -> yast2-add-on-creator-2.17.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.17.4/src/add-on-creator.ycp new/yast2-add-on-creator-2.17.5/src/add-on-creator.ycp
--- old/yast2-add-on-creator-2.17.4/src/add-on-creator.ycp 2008-09-09 11:01:00.000000000 +0200
+++ new/yast2-add-on-creator-2.17.5/src/add-on-creator.ycp 2008-10-10 13:37:39.000000000 +0200
@@ -24,7 +24,7 @@
* Summary: Main file
* Authors: Jiri Suchomel
*
- * $Id: add-on-creator.ycp 47967 2008-06-02 06:27:18Z jsuchome $
+ * $Id: add-on-creator.ycp 50855 2008-09-09 09:09:56Z jsuchome $
*
* Main file for add-on-creator configuration. Uses all other files.
*/
@@ -438,7 +438,7 @@
map cont = add_on["content_map"]:$[];
// command line summary, %1 is order, %2 product name
CommandLine::Print (sformat (_("(%1) Product Name: %2"),
- i, cont["PRODUCT"]:""));
+ i, cont["NAME"]:""));
// command line summary
CommandLine::Print (sformat (_("\tVersion: %1"), cont["VERSION"]:""));
// command line summary
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.17.4/src/AddOnCreator.ycp new/yast2-add-on-creator-2.17.5/src/AddOnCreator.ycp
--- old/yast2-add-on-creator-2.17.4/src/AddOnCreator.ycp 2008-09-09 11:01:00.000000000 +0200
+++ new/yast2-add-on-creator-2.17.5/src/AddOnCreator.ycp 2008-10-13 15:07:07.000000000 +0200
@@ -24,7 +24,7 @@
* Summary: AddOnCreator settings, input and output functions
* Authors: Jiri Suchomel
*
- * $Id: AddOnCreator.ycp 49699 2008-08-05 11:26:49Z jsuchome $
+ * $Id: AddOnCreator.ycp 50855 2008-09-09 09:09:56Z jsuchome $
*
* Representation of the configuration of add-on-creator.
* Input and output routines.
@@ -132,14 +132,31 @@
map content_descr = $[
- "PRODUCT" : $[
- "key" : "PRODUCT",
+ "CONTENTSTYLE" : $[
+ "key" : "CONTENTSTYLE",
+ // label of content file key
+ "label" : _("Content file style"),
+ // help text for content file CONTENTSTYLE key
+ "help" : _("Must be the first tag of the content file"),
+ "value" : "11",
+ "mandatory" : true,
+ ],
+ "NAME" : $[
+ "key" : "NAME",
// label of content file key
"label" : _("Product name"),
- // help text for content file 'PRODUCT' key
- "help" : _("Name of the add-on product"),
+ // help text for content file 'NAME' key
+ "help" : _("For internal usage. Same restrictions as for package names apply."),
"mandatory" : true,
],
+ "BASEARCHS" : $[
+ "key" : "BASEARCHS",
+ // label of content file BASEARCHS key
+ "label" : _("Product architectures"),
+ // help text for content file 'BASEARCHS' key
+ "help" : _("Space-separated list of product architectures for. Matches the available product-release packages architectures. "),
+ "mandatory" : true
+ ],
"VERSION" : $[
"key" : "VERSION",
// label of content file 'VERSION' key
@@ -149,32 +166,12 @@
"value" : "1",
"mandatory" : true,
],
- /*
- "DISTPRODUCT" : $[
- "key" : "DISTPRODUCT",
+ "DISTRIBUTION" : $[ // FIXME default to NAME if missing
+ "key" : "DISTRIBUTION",
// label of content file key
- "label" : _("Distribution ID"),
- // help text for content file 'DISTPRODUCT' key
- "help" : _("Distribution ID (vendor specific). The value of the keyword must not contain spaces. Only letters, numbers, and the characters \".~_-\" are allowed."),
- "mandatory" : true,
- ],
- "DISTVERSION" : $[
- "key" : "DISTVERSION",
- // label of content file key
- "label" : _("Distribution version"),
- // help text for content file 'DISTVERSION' key
- "help" : _("Distribution version (vendor specific)."),
- "value" : "1",
- "mandatory" : true,
- ],
- */
- "VENDOR" : $[
- "key" : "VENDOR",
- // label of content file key
- "label" : _("Vendor name"),
- // help text for content file 'VENDOR' key
- "help" : _("Vendor name (free form)."),
- "mandatory" : true,
+ "label" : _("Distribution name"), // FIXME
+ // help text for content file 'DISTRIBUTION' key
+ "help" : _(""),
],
"DESCRDIR" : $[
"key" : "DESCRDIR",
@@ -194,7 +191,64 @@
"value" : "suse",
"mandatory" : true,
],
- /*
+ "LABEL" : $[
+ "key" : "LABEL",
+ // label of content file key
+ "label" : _("Label"),
+ // help text for content file '' key
+ "help" : _("UTF-8 encoded label. Default label if <b>LINGUAS</b> is omitted or no default language can be determined."),
+ ],
+ "LINGUAS" : $[
+ "key" : "LINGUAS",
+ // label of content file 'LINGUAS' key
+ "label" : _("Languages"),
+ // help text for content file 'LINGUAS' key
+ "help" : _("ISO language code or language code_country code."),
+ ],
+ "LANGUAGE" : $[
+ "key" : "LANGUAGE",
+ // label of content file 'LANGUAGE' key
+ "label" : _("Default language"),
+ // help text for content file 'LANGUAGE' key
+ "help" : _("Default language code."),
+ "type" : "combo",
+ "allowed_values" : nil,
+ ],
+ "PATTERNS" : $[
+ "key" : "PATTERNS",
+ // label of content file 'PATTERNS' key
+ "label" : _("Preselected patterns"),
+ // help text for content file 'PATTERNS' key
+ "help" : _("List of patterns preselected by the product."),
+ ],
+ "VENDOR" : $[
+ "key" : "VENDOR",
+ // label of content file key
+ "label" : _("Vendor name"),
+ // help text for content file 'VENDOR' key
+ "help" : _("Vendor name (free form)."),
+ "mandatory" : true,
+ ],
+ "RELNOTESURL" : $[
+ "key" : "RELNOTESURL",
+ // label of content file 'RELNOTESURL' key
+ "label" : _("Release notes URL"),
+ // help text for content file 'RELNOTESURL' key
+ "help" : _("URL from which to fetch release notes."),
+ ],
+ "UPDATEURLS" : $[
+ "key" : "UPDATEURLS",
+ // label of content file 'UPDATEURLS' key
+ "label" : _("Update URL"),
+ // help text for content file 'UPDATEURLS' key
+ "help" : _("URL of the update source."),
+ ],
+/*
+ "SHORTLABEL" : $[
+ "key" : "SHORTLABEL",
+ // label of content file 'SHORTLABEL' key
+ "label" : _("Short label"),
+ ],
"DEFAULTBASE" : $[
"key" : "DEFAULTBASE",
// label of content file key
@@ -205,15 +259,31 @@
"type" : "combo",
"allowed_values" : allowed_archs,
],
- */
- "LABEL" : $[
- "key" : "LABEL",
+ "PRODUCT" : $[
+ "key" : "PRODUCT",
// label of content file key
- "label" : _("Label"),
- // help text for content file '' key
- "help" : _("UTF-8 encoded label. Default label if <b>LINGUAS</b> is omitted or no default language can be determined."),
+ "label" : _("Product name"),
+ // help text for content file 'PRODUCT' key
+ "help" : _("Name of the add-on product"),
+ "mandatory" : true,
+ ],
+ "DISTPRODUCT" : $[
+ "key" : "DISTPRODUCT",
+ // label of content file key
+ "label" : _("Distribution ID"),
+ // help text for content file 'DISTPRODUCT' key
+ "help" : _("Distribution ID (vendor specific). The value of the keyword must not contain spaces. Only letters, numbers, and the characters \".~_-\" are allowed."),
+ "mandatory" : true,
+ ],
+ "DISTVERSION" : $[
+ "key" : "DISTVERSION",
+ // label of content file key
+ "label" : _("Distribution version"),
+ // help text for content file 'DISTVERSION' key
+ "help" : _("Distribution version (vendor specific)."),
+ "value" : "1",
+ "mandatory" : true,
],
- /*
"REQUIRES" : $[
"key" : "REQUIRES",
// label of content file key
@@ -279,31 +349,6 @@
// help text for content file 'ENHANCES' key
"help" : _("A reverse <b>SUGGESTS</b>. This product can be installed if this capability is provided by an installed resolvable. It is just a hint for an application. For example, <i>SuSEplugger</i> can suggest packages for installation if specific hardware is found."),
],
- */
- "LINGUAS" : $[
- "key" : "LINGUAS",
- // label of content file 'LINGUAS' key
- "label" : _("Languages"),
- // help text for content file 'LINGUAS' key
- "help" : _("ISO language code or language code_country code."),
-// TODO editor
- ],
- "LANGUAGE" : $[
- "key" : "LANGUAGE",
- // label of content file 'LANGUAGE' key
- "label" : _("Default language"),
- // help text for content file 'LANGUAGE' key
- "help" : _("Default language code."),
- "type" : "combo",
- "allowed_values" : nil,
- ],
- "RELNOTESURL" : $[
- "key" : "RELNOTESURL",
- // label of content file 'RELNOTESURL' key
- "label" : _("Release notes URL"),
- // help text for content file 'RELNOTESURL' key
- "help" : _("URL from which to fetch release notes."),
- ],
"FLAGS" : $[
"key" : "FLAGS",
// label of content file 'FLAGS' key
@@ -311,25 +356,7 @@
// help text for content file 'FLAGS' key
"help" : _("Product-specific capabilities."),
],
- "UPDATEURLS" : $[
- "key" : "UPDATEURLS",
- // label of content file 'UPDATEURLS' key
- "label" : _("Update URL"),
- // help text for content file 'UPDATEURLS' key
- "help" : _("URL of the update source."),
- ],
- "PATTERNS" : $[
- "key" : "PATTERNS",
- // label of content file 'PATTERNS' key
- "label" : _("Preselected patterns"),
- // help text for content file 'PATTERNS' key
- "help" : _("List of patterns preselected by the product."),
- ],
- "SHORTLABEL" : $[
- "key" : "SHORTLABEL",
- // label of content file 'SHORTLABEL' key
- "label" : _("Short label"),
- ],
+ */
];
// skeletons for special keys in content file
@@ -660,6 +687,10 @@
// just key:value mapping based on content list
global map content_map = $[];
+// info for product.xml
+global map product_info = $[];
+
+
/**
* if we have 'source add-on' to base the new one on
*/
@@ -852,12 +883,10 @@
map out = (map) SCR::Execute (.target.bash_output, "/usr/bin/id --user");
if (out["stdout"]:"" != "0\n" && out["stdout"]:"" != "")
{
- // FIXME use getenv builtin when it is available
- /*
out = (map) SCR::Execute (.target.bash_output, "echo $HOME");
string home = deletechars (out["stdout"]:"", "\n");
- */
- string home = getenv ("HOME");
+// FIXME update to new yast2-core
+// string home = getenv ("HOME");
if (home != "" && home != nil)
add_on_products_file = home + "/add_on_products.ycp";
}
@@ -909,22 +938,6 @@
return true;
}
-/*
-// proposal for ARCH.* values (of content file)
-// FIXME this won't work for other architectures...
-global string ValueForArchitecture (string arch_dir) {
-
- string val = "";
- foreach (string arch, allowed_archs, {
- if (arch == arch_dir)
- val = arch;
- else if (val != "")
- val = val + " " + arch;
- });
- return val;
-}
-*/
-
// read the content file given by file name
global list<map> ReadContentFile (string file_path) {
@@ -1386,6 +1399,8 @@
out = (map) SCR::Execute (.target.bash_output,
sformat ("find %1 -name '*.rpm'", rpm_path));
y2milestone ("asking the RPM's for ARCH and NAME...");
+ // for which architectures are the packages built
+ map package_architectures = $[];
foreach (string f, splitstring (out["stdout"]:"", "\n"), {
if (f == "") return;
out = (map) SCR::Execute (.target.bash_output,
@@ -1406,7 +1421,10 @@
if (!haskey (srcpackage2filename, arch))
srcpackage2filename[arch] = $[];
if (arch != "src")
+ {
package2filename[arch,name] = f;
+ package_architectures[arch] = 1;
+ }
else
srcpackage2filename[arch,name] = f;
}
@@ -1421,6 +1439,16 @@
foreach (string key, map entry, content_descr, {
if (content_map[key]:"" != "")
entry["value"] = content_map[key]:"";
+ // FIXME what default to put into BASEARCHS?
+ if (key == "BASEARCHS")
+ {
+ string archs = mergestring (arch_directories, " ");
+ if (arch_directories == [])
+ archs = mergestring ((list<string>) maplist (
+ string a, any v, package_architectures,``(a)), " "
+ );
+ entry["value"] = archs;
+ }
content = add (content, entry);
});
/*
@@ -1529,10 +1557,16 @@
foreach (map entry, content_data, {
if (entry["value"]:"" != "")
{
- file = file + sformat ("%1 %2\n",entry["key"]:"",entry["value"]:"");
+ if (entry["key"]:"" != "CONTENTSTYLE")
+ {
+ file = file +
+ sformat ("%1 %2\n",entry["key"]:"",entry["value"]:"");
+ }
content_map[entry["key"]:""] = entry["value"]:"";
}
});
+ // CONTENTSTYLE must be first key...
+ file = sformat ("CONTENTSTYLE %1\n", content_map["CONTENTSTYLE"]:"11")+file;
return SCR::Write (.target.string, base_path + "/content", file);
}
@@ -1734,7 +1768,7 @@
if (cont == "")
{
cont = "/\t" +
- content_map["PRODUCT"]:"" + " " +
+ content_map["NAME"]:"" + " " +
content_map["VERSION"]:"";
}
SCR::Write (.target.string,
@@ -2395,9 +2429,8 @@
if (!FileUtils::Exists (dir_path) || !FileUtils::Exists (iso_p)) return false;
if (name == "")
- name = sformat ("%1-%2-%3",
- tolower (content_map["PRODUCT"]:"addon"),
- content_map["VERSION"]:"", content_map["DEFAULTBASE"]:"");
+ name = sformat ("%1-%2",
+ tolower (content_map["NAME"]:"addon"), content_map["VERSION"]:"");
if (!issubstring (name, ".iso"))
name = name + ".iso";
current_product["iso_name"] = name; // ??
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.17.4/src/complex.ycp new/yast2-add-on-creator-2.17.5/src/complex.ycp
--- old/yast2-add-on-creator-2.17.4/src/complex.ycp 2008-09-09 11:06:06.000000000 +0200
+++ new/yast2-add-on-creator-2.17.5/src/complex.ycp 2008-10-13 13:57:03.000000000 +0200
@@ -24,7 +24,7 @@
* Summary: Dialogs definitions
* Authors: Jiri Suchomel
*
- * $Id: complex.ycp 48336 2008-06-16 13:39:14Z jsuchome $
+ * $Id: complex.ycp 50855 2008-09-09 09:09:56Z jsuchome $
*/
{
@@ -118,7 +118,8 @@
map content_map = add_on["content_map"]:$[];
i = i + 1;
return `item (`id (i),
- content_map["PRODUCT"]:"", content_map["VERSION"]:"");
+ content_map["NAME"]:content_map["PRODUCT"]:"",
+ content_map["VERSION"]:"");
});
}
list summary_items = get_summary_items ();
@@ -221,7 +222,7 @@
{
// yes/no popup
if (Popup::YesNo (sformat (_("Really delete configuration \"%1\"?"),
- current_product["content_map","PRODUCT"]:"")))
+ current_product["content_map","NAME"]:"")))
{
add_on_products = remove (add_on_products, current);
summary_items = get_summary_items ();
@@ -354,7 +355,6 @@
ret = `copy;
}
break;
- // FIXME checks...
}
else if (ret == `abort || ret == `cancel || ret == `back) {
if(ReallyAbort()) break;
@@ -377,16 +377,16 @@
map current_product = AddOnCreator::current_product;
// FIXME handle REQUIRES in new product-specific package
- string requires = AddOnCreator::content_map["REQUIRES"]:"";
+ string requires = AddOnCreator::product_info["REQUIRES"]:"";
if (requires == "")
- requires = "product:openSUSE = 11.0";
+ requires = "product:openSUSE = 11.0"; // FIXME different values
string old_dir = current_product["rpm_path"]:"";
if (old_dir == nil)
current_product["rpm_path"] = "";
string old_requires = requires;
- string product = AddOnCreator::content_map["PRODUCT"]:"";
+ string product = AddOnCreator::content_map["NAME"]:"";
string old_product = product == "" ? nil : product;
string version = AddOnCreator::content_map["VERSION"]:"";
@@ -573,16 +573,11 @@
AddOnCreator::current_product["required_rpm_path"] = req_dir;
if (requires == "")
requires = (string) UI::QueryWidget (`id(`other_val), `Value);
- AddOnCreator::content_map["REQUIRES"] = requires;
- AddOnCreator::content_map["PRODUCT"] = product;
- AddOnCreator::content_map["VERSION"] = version;
+ AddOnCreator::product_info["REQUIRES"] = requires;
- /* FIXME does this make a sense???
- we need to generate again when editing previous project
- if (requires == old_requires && dir == old_dir &&
- product == old_product && version == old_version)
- ret = `skip_gen;
- */
+ AddOnCreator::content_map["NAME"] = product;
+ AddOnCreator::content_map["VERSION"] = version;
+// FIXME propose DISTRIBUTION as NAME - VERSION?
// if rpm_path is different, reset packages_descr
// (otherwise current values settings are merged into generated)
@@ -617,12 +612,12 @@
string ValidateContentValue (string key, any val) {
string sval = sformat ("%1", val);
- if (key == "PRODUCT")
+ if (key == "NAME")
{
if (deletechars (sval, String::CAlnum() + ".~_-") != "" )
{
// error popup (input validation failed)
- return _("The value of PRODUCT may contain only
+ return _("The value of NAME may contain only
letters, numbers, and the characters \".~_-\".");
}
}
@@ -860,19 +855,9 @@
}
else if (ret == `next) {
list<string> missing = [];
- /*
- boolean arch_present = false;
- string default_base = "";
- */
foreach (map entry, content, {
if (entry["value"]:"" == "" && entry["mandatory"]:false)
missing = add (missing, entry["key"]:"");
- /*
- if (substring (entry["key"]:"",0,4) == "ARCH")
- arch_present = true;
- if (entry["key"]:"" == "DEFAULTBASE")
- default_base = entry["value"]:"";
- */
});
if (missing != [])
{
@@ -881,24 +866,14 @@
%1"), mergestring (missing, "\n")));
continue;
}
- /*
- if (!arch_present)
- {
- // we should not get here, because ARCH's are created
- // after entering source with RPM's
- content = add (content, union ($[
- "key" : "ARCH." + default_base,
- "value": AddOnCreator::ValueForArchitecture (default_base)
- ], AddOnCreator::content_specials["ARCH"]:$[]));
- }
- */
integer i = 0;
integer index = -1;
string product = "";
foreach (map entry, content, {
if (entry["key"]:"" == "LABEL" && entry["value"]:"" == "")
index = i;
- if (entry["key"]:"" == "PRODUCT")
+// FIXME fill default value of DISTRIBUTION and BASEARCHS (and not only in UI)
+ if (entry["key"]:"" == "NAME")
product = entry["value"]:"";
i = i + 1;
});
@@ -1732,7 +1707,7 @@
}
/**
- * TODO better placing, more dialogs?
+ * Output settings
* @return dialog result
*/
any OutputDialog() {
@@ -1748,16 +1723,9 @@
string iso_name = current_product["iso_name"]:"";
if (iso_name == "")
iso_name = sformat ("%1-%2",
- tolower (content_map["PRODUCT"]:""),
- content_map["VERSION"]:""
- );
- /*
- iso_name = sformat ("%1-%2-%3",
- tolower (content_map["PRODUCT"]:""),
- content_map["VERSION"]:"",
- content_map["DEFAULTBASE"]:""
+ tolower (content_map["NAME"]:""),
+ content_map["VERSION"]:"" // FIXME no DEFAULTBASE for %1-%2-%3
);
- */
term contents = `HBox (`HSpacing (), `VBox (
`HBox (
@@ -1771,10 +1739,6 @@
)
),
// check box label
-//FIXME `Left (`CheckBox (`id(`autorun), _("&Autorun"), autorun)),
-
-
- // check box label
`Left (`CheckBox (`id(`iso),`opt(`notify),_("Create &ISO Image"), iso)),
`HBox (
`HSpacing (2),
@@ -1882,7 +1846,7 @@
// summary header
sum = Summary::AddHeader (sum, _("Product Name"));
- sum = Summary::AddLine (sum, AddOnCreator::content_map["PRODUCT"]:"");
+ sum = Summary::AddLine (sum, AddOnCreator::content_map["NAME"]:"");
// summary header
sum = Summary::AddHeader (sum, _("Patterns"));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.17.4/src/helps.ycp new/yast2-add-on-creator-2.17.5/src/helps.ycp
--- old/yast2-add-on-creator-2.17.4/src/helps.ycp 2008-09-09 11:01:00.000000000 +0200
+++ new/yast2-add-on-creator-2.17.5/src/helps.ycp 2008-09-09 11:09:56.000000000 +0200
@@ -24,7 +24,7 @@
* Summary: Help texts of all the dialogs
* Authors: Jiri Suchomel
*
- * $Id: helps.ycp 46575 2008-04-14 12:26:34Z jsuchome $
+ * $Id: helps.ycp 50855 2008-09-09 09:09:56Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.17.4/src/patterns.ycp new/yast2-add-on-creator-2.17.5/src/patterns.ycp
--- old/yast2-add-on-creator-2.17.4/src/patterns.ycp 2008-08-18 11:30:28.000000000 +0200
+++ new/yast2-add-on-creator-2.17.5/src/patterns.ycp 2008-10-10 13:46:25.000000000 +0200
@@ -178,9 +178,10 @@
any PatternsDialog() {
map current_product = AddOnCreator::current_product;
- string requires = AddOnCreator::content_map["REQUIRES"]:"";
string import_path = current_product["rpm_path"]:"";
map patterns = current_product["patterns"]:$[];
+ string content_patterns = AddOnCreator::content_map["PATTERNS"]:"";
+ list<string> proposed_patterns = splitstring (content_patterns, " ");
// helper for generation of table items
list get_pattern_items (map pattern) {
@@ -259,7 +260,7 @@
UI::ChangeWidget (`id(`pattern), `Items,
get_pattern_items (patterns[current_pattern]:$[]));
UI::ChangeWidget (`id(`required), `Value,
- issubstring (requires, "pattern:" + current_pattern));
+ contains (proposed_patterns, current_pattern));
}
foreach (symbol w, [ `delete_pt, `edit, `add, `delete, `required ], {
UI::ChangeWidget (`id (w), `Enabled, patterns != $[]);
@@ -334,7 +335,7 @@
get_pattern_items (patterns[current_pattern]:$[]));
UI::ChangeWidget (`id(`required), `Value,
size (patterns) > 0 &&
- issubstring (requires, "pattern:" + sel));
+ contains (proposed_patterns, sel));
}
}
else if (ret == `add) {
@@ -390,26 +391,27 @@
{
if (UI::QueryWidget (`id (`required), `Value) == true)
{
- if (!issubstring (requires, "pattern:" + sel))
- requires = requires + " pattern:" + sel;
+ if (!contains (proposed_patterns, sel))
+ proposed_patterns = add (proposed_patterns, sel);
}
- else if (issubstring (requires, "pattern:" + sel))
+ else if (contains (proposed_patterns, sel))
{
- list<string> req = splitstring (requires, " ");
- requires = mergestring (filter (string r, req, ``(r != "pattern:" + sel)), " ");
+ proposed_patterns = filter (string p, proposed_patterns,
+ ``(sel != p));
}
}
else if (ret == `next) {
AddOnCreator::current_product["patterns"] = patterns;
- if (AddOnCreator::content_map["REQUIRES"]:"" != requires)
+ content_patterns = mergestring (proposed_patterns, " ");
+ if (AddOnCreator::content_map["PATTERNS"]:"" != content_patterns)
{
integer i = 0;
foreach (map entry, AddOnCreator::content, {
- if (entry["key"]:"" == "REQUIRES")
- AddOnCreator::content[i,"value"] = requires;
+ if (entry["key"]:"" == "PATTERNS")
+ AddOnCreator::content[i,"value"]= content_patterns;
i = i + 1;
});
- AddOnCreator::content_map["REQUIRES"] = requires;
+ AddOnCreator::content_map["PATTERNS"] = content_patterns;
}
break;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.17.4/VERSION new/yast2-add-on-creator-2.17.5/VERSION
--- old/yast2-add-on-creator-2.17.4/VERSION 2008-09-09 11:08:54.000000000 +0200
+++ new/yast2-add-on-creator-2.17.5/VERSION 2008-10-13 16:28:36.000000000 +0200
@@ -1 +1 @@
-2.17.4
+2.17.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org