Author: jsuchome Date: Thu Aug 2 11:50:37 2007 New Revision: 39888 URL: http://svn.opensuse.org/viewcvs/yast?rev=39888&view=rev Log: - "installation source" changed to "repository" - mark the output product as "base" - added simplified UI for kiwi - 2.15.1 Modified: trunk/product-creator/VERSION trunk/product-creator/agent-kiwi/ag_kiwi trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/Kiwi.ycp trunk/product-creator/src/Makefile.am trunk/product-creator/src/ProductCreator.ycp trunk/product-creator/src/kiwi.desktop trunk/product-creator/src/kiwi_dialogs.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=39888&r1=39887&r2=39888&view=diff ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Thu Aug 2 11:50:37 2007 @@ -1 +1 @@ -2.15.0 +2.15.1 Modified: trunk/product-creator/agent-kiwi/ag_kiwi URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/agent-kiwi/ag_kiwi?rev=39888&r1=39887&r2=39888&view=diff ============================================================================== --- trunk/product-creator/agent-kiwi/ag_kiwi (original) +++ trunk/product-creator/agent-kiwi/ag_kiwi Thu Aug 2 11:50:37 2007 @@ -29,7 +29,7 @@ my $optionsNodeList = $systemTree -> getElementsByTagName ("preferences"); my $usrdataNodeList = $systemTree -> getElementsByTagName ("users"); my $packageNodeList = $systemTree -> getElementsByTagName ("packages"); - my $imgnameNodeList = $systemTree -> getElementsByTagName ("image"); +# my $imgnameNodeList = $systemTree -> getElementsByTagName ("image"); my $key = "packages"; $retmap{$key} = {}; @@ -38,6 +38,8 @@ my $type = $node -> getAttribute ("type"); y2milestone ("package list type: $type"); $retmap{$key}{$type} = {}; + my $patterntype = $node -> getAttribute ("patternType"); + $retmap{$key}{$type}{"patternType"} = $patterntype if $patterntype; foreach my $tag ("package", "opensusePattern", "ignore") { my @sw_list = (); foreach my $element ($node -> getElementsByTagName ($tag)) { @@ -92,6 +94,10 @@ $retmap{$tag} = $element-> get_node(1)->textContent () if ($element); } + my $image = $systemTree -> getElementsByTagName ("image")->get_node (1); + my $image_name = $image -> getAttribute ("name"); + $retmap{"name"} = $image_name if $image_name; + $retmap{"users"} = {}; foreach my $usernode ($usrdataNodeList -> get_nodelist()) { my $group = $usernode -> getAttribute("group"); @@ -128,26 +134,25 @@ } } $key = "repository"; - $retmap{$key} = {}; + my @repolist = (); for (my $i=1;$i<= $repositNodeList->size();$i++) { my $node = $repositNodeList -> get_node($i); - my $type = $node -> getAttribute ("type"); - y2milestone ("repo type: $type"); - my $status = $node -> getAttribute ("status"); - $retmap{$key}{$type} = {}; - $retmap{$key}{$type}{"status"} = $status if $status; - foreach my $tag ("source") { - # maybe it doesn't have sense to have list of sources in one repo... - my @list = (); - foreach my $element ($node -> getElementsByTagName ($tag)) { - my %item = (); - my $path = $element -> getAttribute ("path"); - $item{"path"} = $path if $path; - push @list, \%item if %item; - } - $retmap{$key}{$type}{$tag} = \@list if @list; + my %repo = (); + foreach my $tag ("type", "status") { + my $val = $node -> getAttribute ($tag); + $repo{$tag} = $val if $val; + } + my @list = (); # maybe list is not needed here... + foreach my $element ($node -> getElementsByTagName ("source")) { + my %item = (); + my $path = $element -> getAttribute ("path"); + $item{"path"} = $path if $path; + push @list, \%item if %item; } + $repo{"source"} = \@list if @list; + push @repolist, \%repo if %repo; } + $retmap{$key} = \@repolist if @repolist; ycp::Return (\%retmap, 1); } elsif ($command eq "result") 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=39888&r1=39887&r2=39888&view=diff ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Thu Aug 2 11:50:37 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Aug 2 09:34:21 CEST 2007 - jsuchome@suse.cz + +- "installation source" changed to "repository" +- mark the output product as "base" +- added simplified UI for kiwi +- 2.15.1 + +------------------------------------------------------------------- Wed Jul 25 09:41:05 CEST 2007 - lslezak@suse.cz - fixed "Back" button behavior in the Isolinux configuration Modified: trunk/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev=39888&r1=39887&r2=39888&view=diff ============================================================================== --- trunk/product-creator/src/Kiwi.ycp (original) +++ trunk/product-creator/src/Kiwi.ycp Thu Aug 2 11:50:37 2007 @@ -68,9 +68,7 @@ map get_source_value (string source) { string type = "yast2"; - string source_path = source; - if (substring (source, 0, 1) == "/") - source_path = "dir://" + source; + string source_path = adapt_source_path (source); foreach (map sourcemap, all_sources, { integer srcid = sourcemap["SrcId"]:-1; @@ -90,7 +88,7 @@ "__children": [ $[ "__key" : "source", - "path" : source + "path" : source_path ] ] ]; Modified: trunk/product-creator/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Makefile.am?rev=39888&r1=39887&r2=39888&view=diff ============================================================================== --- trunk/product-creator/src/Makefile.am (original) +++ trunk/product-creator/src/Makefile.am Thu Aug 2 11:50:37 2007 @@ -21,7 +21,8 @@ kiwi_dialogs.ycp desktop_DATA = \ - product-creator.desktop + product-creator.desktop \ + kiwi.desktop module_DATA = \ ProductCreator.ycp \ Modified: trunk/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreator.ycp?rev=39888&r1=39887&r2=39888&view=diff ============================================================================== --- trunk/product-creator/src/ProductCreator.ycp (original) +++ trunk/product-creator/src/ProductCreator.ycp Thu Aug 2 11:50:37 2007 @@ -93,6 +93,9 @@ // What we want to create with kiwi global string kiwi_task = "iso"; +// if the YaST sources should be enabled when opening package selector +global boolean enable_sources = true; + // original source configuration, needed to reset the package manager list