Author: jsuchome Date: Thu Feb 12 11:25:02 2009 New Revision: 55456 URL: http://svn.opensuse.org/viewcvs/yast?rev=55456&view=rev Log: - version tag must be at first place in package description file (bnc#384835) - offered SLE10SP3 products as a base for new AddOn, removed SP1 - 2.13.30 Modified: branches/SuSE-SLE-10-SP3-Branch/add-on-creator/VERSION branches/SuSE-SLE-10-SP3-Branch/add-on-creator/agents/ag_packages_descr branches/SuSE-SLE-10-SP3-Branch/add-on-creator/package/yast2-add-on-creator.changes branches/SuSE-SLE-10-SP3-Branch/add-on-creator/src/complex.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/add-on-creator/VERSION?rev=55456&r1=55455&r2=55456&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/add-on-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/add-on-creator/VERSION Thu Feb 12 11:25:02 2009 @@ -1 +1 @@ -2.13.29 +2.13.30 Modified: branches/SuSE-SLE-10-SP3-Branch/add-on-creator/agents/ag_packages_descr URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/add-on-creator/agents/ag_packages_descr?rev=55456&r1=55455&r2=55456&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/add-on-creator/agents/ag_packages_descr (original) +++ branches/SuSE-SLE-10-SP3-Branch/add-on-creator/agents/ag_packages_descr Thu Feb 12 11:25:02 2009 @@ -30,6 +30,7 @@ my $multiline_key = ""; my $multiline_val = ""; %description = (); + $version = ""; foreach my $line (<PACKAGES>) { chomp $line; @@ -47,7 +48,9 @@ if ($key eq "Ver") { $version = $val; } - $description{$pkg_name}{$key} = $val; + else { + $description{$pkg_name}{$key} = $val; + } } } elsif ($line =~ /^\+([\w]+):.*/) { @@ -88,9 +91,11 @@ $err_no = 11; return 0; } + my $cont = ""; + # version must be on top (bnc#384835) + $cont = "=Ver: $version\n" if $version; # sort order: system items go before local ones foreach my $pkg_name (sort keys %{$descr}) { - my $cont = ""; my $data = $descr->{$pkg_name}; next if (ref $data ne "HASH"); if ($pkg_name ne "___global___") { @@ -111,8 +116,8 @@ $cont = $cont."=$key: $val\n"; } } - print PACKAGES $cont; } + print PACKAGES $cont; close PACKAGES; return 1; } Modified: branches/SuSE-SLE-10-SP3-Branch/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/add-on-creator/package/yast2-add-on-creator.changes?rev=55456&r1=55455&r2=55456&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/add-on-creator/package/yast2-add-on-creator.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/add-on-creator/package/yast2-add-on-creator.changes Thu Feb 12 11:25:02 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Feb 12 11:10:16 CET 2009 - jsuchome@suse.cz + +- version tag must be at first place in package description file + (bnc#384835) +- offered SLE10SP3 products as a base for new AddOn, removed SP1 +- 2.13.30 + +------------------------------------------------------------------- Fri Apr 4 09:45:21 CEST 2008 - jsuchome@suse.cz - offered SLE10SP2 products as a base for new AddOn Modified: branches/SuSE-SLE-10-SP3-Branch/add-on-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/add-on-creator/src/complex.ycp?rev=55456&r1=55455&r2=55456&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/add-on-creator/src/complex.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/add-on-creator/src/complex.ycp Thu Feb 12 11:25:02 2009 @@ -215,18 +215,10 @@ // radio button label _("SUSE Linux &Enterprise Server 10"), requires == "sles-release-10")), - `Left (`RadioButton(`id(`sles10sp1), `opt (`notify), - // radio button label - _("SUSE &Linux Enterprise Server 10 SP1"), - requires == "product:SUSE_SLES = 10.1")), `Left (`RadioButton(`id(`sled10), `opt (`notify), // radio button label _("SUSE Linux Enterprise &Desktop 10"), requires == "sled-release-10")), - `Left (`RadioButton(`id(`sled10sp1), `opt (`notify), - // radio button label - _("SUSE L&inux Enterprise &Desktop 10 SP1"), - requires == "product:SUSE_SLED = 10.1")), `Left (`RadioButton(`id(`sle10sp1), `opt (`notify), // radio button label _("S&USE Linux Enterprise 10 SP1"), @@ -235,6 +227,10 @@ // radio button label _("S&USE Linux Enterprise 10 SP2"), requires == "product:SUSE_SLE = 10.2")), + `Left (`RadioButton(`id(`sle10sp3), `opt (`notify), + // radio button label + _("S&USE Linux Enterprise 10 SP3"), + requires == "product:SUSE_SLE = 10.3")), `HBox ( `Left(`RadioButton(`id(`other), `opt (`notify), // radio button label @@ -313,18 +309,10 @@ requires = "sles-release-10"; UI::ChangeWidget (`id(`other_val), `Enabled, false); } - else if (ret == `sles10sp1) { - requires = "product:SUSE_SLES = 10.1"; - UI::ChangeWidget (`id(`other_val), `Enabled, false); - } else if (ret == `sled10) { requires = "sled-release-10"; UI::ChangeWidget (`id(`other_val), `Enabled, false); } - else if (ret == `sled10sp1) { - requires = "product:SUSE_SLED = 10.1"; - UI::ChangeWidget (`id(`other_val), `Enabled, false); - } else if (ret == `sle10sp1) { requires = "product:SUSE_SLE = 10.1"; UI::ChangeWidget (`id(`other_val), `Enabled, false); @@ -333,6 +321,10 @@ requires = "product:SUSE_SLE = 10.2"; UI::ChangeWidget (`id(`other_val), `Enabled, false); } + else if (ret == `sle10sp3) { + requires = "product:SUSE_SLE = 10.3"; + UI::ChangeWidget (`id(`other_val), `Enabled, false); + } else if (ret == `suse101) { requires = "suse-release-10.1"; UI::ChangeWidget (`id(`other_val), `Enabled, false); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org