Author: jsuchome
Date: Wed Jun 18 13:24:45 2008
New Revision: 48389
URL: http://svn.opensuse.org/viewcvs/yast?rev=48389&view=rev
Log:
- handle pattern file with more patterns when deleting unused
ones (bnc#393515)
- do not delete patters required by selected ones
- 2.17.2
Modified:
trunk/product-creator/VERSION
trunk/product-creator/package/yast2-product-creator.changes
trunk/product-creator/src/ProductCreator.ycp
trunk/product-creator/src/complex.ycp
trunk/product-creator/yast2-product-creator.spec.in
Modified: trunk/product-creator/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=48389&r1=48388&r2=48389&view=diff
==============================================================================
--- trunk/product-creator/VERSION (original)
+++ trunk/product-creator/VERSION Wed Jun 18 13:24:45 2008
@@ -1 +1 @@
-2.17.1
+2.17.2
Modified: trunk/product-creator/package/yast2-product-creator.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-product-creator.changes?rev=48389&r1=48388&r2=48389&view=diff
==============================================================================
--- trunk/product-creator/package/yast2-product-creator.changes (original)
+++ trunk/product-creator/package/yast2-product-creator.changes Wed Jun 18 13:24:45 2008
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Wed Jun 18 13:13:13 CEST 2008 - jsuchome@suse.cz
+
+- handle pattern file with more patterns when deleting unused
+ ones (bnc#393515)
+- do not delete patters required by selected ones
+- 2.17.2
+
+-------------------------------------------------------------------
Mon Jun 16 14:20:55 CEST 2008 - jsuchome@suse.cz
- image-creator: removed dependency on ag_kiwi, use generci ag_anyxml
Modified: trunk/product-creator/src/ProductCreator.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreator.ycp?rev=48389&r1=48388&r2=48389&view=diff
==============================================================================
--- trunk/product-creator/src/ProductCreator.ycp (original)
+++ trunk/product-creator/src/ProductCreator.ycp Wed Jun 18 13:24:45 2008
@@ -15,6 +15,7 @@
module "ProductCreator";
textdomain "product-creator";
+import "AddOnCreator";
import "Progress";
import "Report";
import "Summary";
@@ -26,6 +27,7 @@
import "Profile";
import "AutoinstSoftware";
import "Arch";
+import "Package";
import "PackageAI";
import "Popup";
import "String";
@@ -82,6 +84,9 @@
global string gpg_passphrase = "";
+map pattern_descr = nil;
+
+
/**
* Abort function
* return boolean return true if abort
@@ -101,6 +106,14 @@
// original source configuration, needed to reset the package manager
list > original_config = nil;
+boolean gzip_is_installed = nil;
+
+boolean gzip_installed () {
+ if (gzip_is_installed == nil)
+ gzip_is_installed = Package::Installed ("gzip");
+ return gzip_is_installed;
+}
+
/**
* Data was modified?
* @return true if modified
@@ -798,6 +811,12 @@
global boolean UpdateMD5File(string directory)
{
string command = sformat("/bin/sh /usr/bin/create_md5sums '%1'", String::Quote(directory));
+
+ if (issubstring (directory, " "))
+ {
+ command = sformat ("cd '%1'; rm MD5SUMS; md5sum -- * > MD5SUMS",
+ String::Quote(directory));
+ }
boolean ret = Exec(command);
y2milestone("MD5SUMS updated: %1", ret);
@@ -1256,6 +1275,75 @@
}
/**
+ * Write the modified file with pattern definitions
+ * @param file_path path to pattern file
+ * @param patterns list of patterns defined in this file
+ * @return success
+ */
+global boolean WritePatternFile (string file_path, list<map> patterns) {
+
+ boolean ret = true;
+ if (pattern_descr == nil)
+ pattern_descr = AddOnCreator::pattern_descr;
+
+ SCR::Execute (.target.remove, file_path);
+ boolean gzip = substring (file_path, size (file_path) - 3, 3) == ".gz";
+ if (gzip)
+ file_path = substring (file_path, 0, size (file_path) - 3);
+
+ string file = "";
+ foreach (map pattern, patterns, {
+
+ if (file != "")
+ {
+ file = sformat ("%1\n# --------------- %2 ----------------\n\n",
+ file, pattern["Pat"]:"");
+ }
+ file = file + sformat ("=Ver: %1\n\n=Pat: %2\n",
+ pattern["Ver"]:"5.0", pattern["Pat"]:"");
+ pattern = remove (remove (pattern, "Ver"), "Pat");
+ string last_key = "";
+ foreach (string key, any val, (map) pattern, {
+ map descr = pattern_descr[key]:$[];
+ // substring (key,0,3) is because of Des.lang, Sum.lang and Cat.lang
+ string shortkey = substring (key,0,3);
+ if (pattern_descr[shortkey]:$[] != $[] &&
+ substring (key, 3, 1) == ".")
+ {
+ descr = pattern_descr[shortkey]:$[];
+ }
+ else shortkey = key;
+ if (val == nil || val == "" || val == [] || descr["internal"]:false)
+ return;
+ if (file != "" && last_key != shortkey)
+ file = file + "\n";
+ if (descr["single_line"]:false)
+ {
+ file = file + sformat ("=%1: %2\n", key, val);
+ }
+ else
+ {
+ file = file + sformat ("+%1:\n%2\n-%1:\n", key, val);
+ }
+ last_key = shortkey;
+ });
+ });
+ if (file != "")
+ {
+ map out = (map) SCR::Execute (.target.bash_output, "LANG=C date");
+ file = file + sformat ("\n\n# Generated by YaST on %1.",
+ deletechars (out["stdout"]:"", "\n"));
+ SCR::Write (.target.string, file_path, file);
+ if (gzip && gzip_installed ())
+ {
+ y2milestone ("compressing pattern file: %1", SCR::Execute (
+ .target.bash, sformat ("gzip '%1'", file_path)));
+ }
+ }
+ return ret;
+}
+
+/**
* Create Skeleton
* @return boolean true on success
*/
@@ -1596,7 +1684,7 @@
}
}
-foreach(integer source_id, enabled, ``{
+ foreach(integer source_id, enabled, ``{
map general_info = Pkg::SourceGeneralData(source_id);
// no extra action for YUM sources
@@ -1757,6 +1845,7 @@
// remove unused patterns (they cannot be used due to missing packages)
if (Config["type"]:`unknown == `patterns)
{
+
list<string> used_patterns = Config["addons"]:[];
if (Config["base"]:"" != "")
{
@@ -1764,6 +1853,23 @@
}
y2milestone("used patterns: %1", used_patterns);
+ // addons 'doesn't include patterns added via dependency
+ foreach (string pattern, used_patterns, {
+ list<map> descrs = Pkg::ResolvableDependencies(pattern,`pattern,"");
+ foreach (map descr, descrs, {
+ foreach (map dep, (list<map>)descr["dependencies"]:[], {
+ if (dep["res_kind"]:"" == "pattern" &&
+ contains (["requires","recommends"],dep["dep_kind"]:""))
+ {
+ used_patterns = add (used_patterns, dep["name"]:"");
+ }
+ });
+ });
+ });
+
+ y2internal ("patterns + dependencies: %1", used_patterns);
+
+
list<string> files = (list<string>)SCR::Read(.target.dir, sformat("%1/%2", skel_root, descrDir));
if (files == nil)
{
@@ -1774,35 +1880,30 @@
y2milestone("found pattern files: %1", files);
- list<string> used_files_regexps = (list<string>)union(maplist(string p, used_patterns, {return sformat("^%1-.*\\.pat$", p);}),
- maplist(string p, used_patterns, {return sformat("^%1-.*\\.pat.gz$", p);}));
-
- y2milestone("used_files_regexps: %1", used_files_regexps);
-
boolean refresh_diryast = false;
- foreach(string f, files,
- {
- boolean match = false;
- foreach(string r, used_files_regexps,
- {
- if (regexpmatch(f, r))
- {
- match = true;
- }
- }
- );
-
- if (!match)
- {
- // remove the pattern
- string cmd = sformat("/bin/rm -- '%1/%2/%3'", String::Quote(skel_root), String::Quote(descrDir), String::Quote(f));
- success = success && Exec(cmd);
- y2milestone("removing pattern %1: %2", f, success);
- refresh_diryast = true;
+ foreach (string file, files, {
+ string file_path = sformat ("%1/%2/%3", skel_root, descrDir, file);
+ list<map> pts = (list<map>) SCR::Read (.pattern.list, file_path);
+ boolean pattern_modified = false;
+ pts = filter (map pt, pts, {
+ string pattern = splitstring (pt["Pat"]:"", " \t")[0]:"";
+ if (! contains (used_patterns, pattern) &&
+ pt["Vis"]:true != false) // do not remove invisible patterns
+ {
+ y2debug ("pattern to delete: %1", pattern);
+ pattern_modified = true;
+ return false;
}
+ y2milestone ("pattern %1 will stay", pattern);
+ return true;
+ });
+ if (pattern_modified)
+ {
+ success = success && WritePatternFile (file_path, pts);
+ refresh_diryast = true;
}
- );
+ });
y2milestone("removed patterns: %1", success);
@@ -1812,17 +1913,17 @@
// FIXME: string cmd = sformat("/bin/rm -f -- '%1/%2/directory.yast' && /usr/bin/create_directory.yast '%1/%2'", String::Quote(skel_root), String::Quote(descrDir));
string cmd = sformat("/bin/rm -f '%1/%2/directory.yast'; cd '%1/%2'; ls | grep -v -e '^\\.$' -e '^\\.\\.$' > '%1/%2/directory.yast'", String::Quote(skel_root), String::Quote(descrDir));
success = success && Exec(cmd);
- y2debug("success: %1", success);
+ y2milestone ("success: %1", success);
+ // this will print error message since they are either pat or pat.gz
cmd = sformat("cd '%1/%2'; ls *.pat *.pat.gz > '%1/%2/patterns'", String::Quote(skel_root), String::Quote(descrDir));
Exec(cmd);
}
}
-
// update MD5SUMS file
success = success && UpdateMD5File(sformat("%1/%2", skel_root, descrDir));
y2debug("success: %1", success);
-});
+ });
skel_root = main_skel_root;
Modified: trunk/product-creator/src/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/complex.ycp?rev=48389&r1=48388&r2=48389&view=diff
==============================================================================
--- trunk/product-creator/src/complex.ycp (original)
+++ trunk/product-creator/src/complex.ycp Wed Jun 18 13:24:45 2008
@@ -339,17 +339,19 @@
Progress::Title(_("ISO image directory ready"));
Progress::Finish();
+ /*
if (!Mode::commandline())
{
Wizard::EnableNextButton();
Wizard::RestoreNextButton();
}
+ */
any ret = nil;
repeat
{
- ret = (Mode::commandline()) ? `next : UI::UserInput();
+ ret = `next;
if (ret == `next)
{
if ( ProductCreator::Config["result"]:"" == "iso")
@@ -531,17 +533,12 @@
return `next;
}
+ /*
Wizard::EnableNextButton();
Wizard::RestoreNextButton();
Wizard::EnableBackButton();
-
- any ret = nil;
- repeat
- {
- ret = UI::UserInput();
- } until (ret == `next || ret == `back || ret == `abort);
-
- return (symbol)ret;
+ */
+ return `next;
}
symbol CheckBootableSrc()
Modified: trunk/product-creator/yast2-product-creator.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/yast2-product-creator.spec.in?rev=48389&r1=48388&r2=48389&view=diff
==============================================================================
--- trunk/product-creator/yast2-product-creator.spec.in (original)
+++ trunk/product-creator/yast2-product-creator.spec.in Wed Jun 18 13:24:45 2008
@@ -1,12 +1,15 @@
@HEADER-COMMENT@
@HEADER@
-BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-packager autoyast2-installation yast2-security
+BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-packager autoyast2-installation yast2-security yast2-add-on-creator
PreReq: %fillup_prereq
Requires: autoyast2-installation yast2-security
+# ag_pattern handling gzipped files
+Requires: yast2-add-on-creator >= 2.17.1
+
# SourceDialogs::IsPlainDir()
Requires: yast2-packager >= 2.16.20
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
