January 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60525 - /tags/branch-Code-11-SP1-2_17_28/product-creator/
by jsuchome＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: jsuchome Date: Mon Jan 25 20:02:56 2010 New Revision: 60525 URL: http://svn.opensuse.org/viewcvs/yast?rev=60525&view=rev Log: Created tag branch-Code-11-SP1-2_17_28 for product-creator Added: tags/branch-Code-11-SP1-2_17_28/product-creator/ (props changed) - copied from r60524, branches/SuSE-Code-11-SP1-Branch/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60524 - /tags/branch-Code-11-SP1-2_17_28/
by jsuchome＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: jsuchome Date: Mon Jan 25 20:02:51 2010 New Revision: 60524 URL: http://svn.opensuse.org/viewcvs/yast?rev=60524&view=rev Log: Created tag branch-Code-11-SP1-2_17_28 Added: tags/branch-Code-11-SP1-2_17_28/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60523 - in /branches/SuSE-Code-11-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/dialogs.ycp src/kiwi_dialogs.ycp src/routines.ycp
by jsuchome＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: jsuchome Date: Mon Jan 25 20:02:45 2010 New Revision: 60523 URL: http://svn.opensuse.org/viewcvs/yast?rev=60523&view=rev Log: - when package cannot be installed, look if it is not provided by something else (bnc#571694) - if primary tag for the boot images is not defined, take the first one (bnc#572727) - 2.17.28 Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp branches/SuSE-Code-11-SP1-Branch/product-creator/src/routines.ycp Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION Mon Jan 25 20:02:45 2010 @@ -1 +1 @@ -2.17.27 +2.17.28 Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes Mon Jan 25 20:02:45 2010 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Jan 25 19:39:12 CET 2010 - jsuchome(a)suse.cz + +- when package cannot be installed, look if it is not provided + by something else (bnc#571694) +- if primary tag for the boot images is not defined, take the first + one (bnc#572727) +- 2.17.28 + +------------------------------------------------------------------- Tue Dec 22 15:43:41 CET 2009 - jsuchome(a)suse.cz - use menubutton for both iso image and directory tree (bnc#438223) Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp Mon Jan 25 20:02:45 2010 @@ -1342,7 +1342,20 @@ { foreach(string p, packages, { - y2milestone("selecting package for installation: %1 -> %2", p, Pkg::PkgInstall(p)); + boolean selected = Pkg::PkgInstall(p); + y2milestone("selecting package for installation: %1 -> %2", p, selected); + if (!selected) + { + list <list> provides = Pkg::PkgQueryProvides (p); + provides = filter (list l, provides, { + return l[1]:`NONE != `NONE; + }); + string pp = provides[0,0]:""; + if (pp != "") + { + y2milestone("selecting first package providing %1: %2 -> %3", p, pp, Pkg::PkgInstall (pp)); + } + } }); } Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Mon Jan 25 20:02:45 2010 @@ -2078,14 +2078,12 @@ UI::ChangeWidget(`id(`out_dir), `Value, Config["iso-directory"]:""); update_repo_table (); list type_its = supported_images != "template" ? default_type_items: []; - boolean primary = false; + kiwi_task = ""; foreach (map typemap, (list<map>) Config["preferences",0,"type"]:[], { string type = typemap[content_key]:""; - if (!primary) + if (typemap["primary"]:"false" == "true" || kiwi_task == "") kiwi_task = type; - if (typemap["primary"]:"false" == "true") - primary = true; if ((supported_images == "" && !contains (present_types, type)) || supported_images == "template") { @@ -2094,6 +2092,11 @@ present_types = union (present_types, [type]); } }); + if (kiwi_task == "") + { + kiwi_task = "iso"; + y2warning ("no task found, setting to 'iso'"); + } UI::ChangeWidget (`id (`type), `Items, type_its); UI::ChangeWidget (`id (`type), `Value, kiwi_task); return true; Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/src/routines.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/src/routines.ycp Mon Jan 25 20:02:45 2010 @@ -38,12 +38,20 @@ // get the primary value of image type to be built ('type' from 'preferences') string get_current_task (map config) { - string task = "iso"; + string task = ""; foreach (map typemap, (list<map>) config["preferences",0,"type"]:[], { - task = typemap[Kiwi::content_key]:task; + if (task == "") // take the 1st one if none is default + task = typemap[Kiwi::content_key]:task; if (typemap["primary"]:"false" == "true") + { + task = typemap[Kiwi::content_key]:task; break; + } }); + if (task == "") + { + y2milestone ("no task found, setting to 'iso'"); + } return task; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60522 - in /branches/SuSE-Code-11-SP1-Branch/storage: libstorage/src/Storage.cc package/yast2-storage.changes
by aschnell＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: aschnell Date: Mon Jan 25 17:32:59 2010 New Revision: 60522 URL: http://svn.opensuse.org/viewcvs/yast?rev=60522&view=rev Log: - fixed default mount-by for multipath (bnc #572209) Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc Mon Jan 25 17:32:59 2010 @@ -2523,11 +2523,33 @@ mby = defaultMountBy; pair<string,unsigned> dp = Disk::getDiskPartition(device); y2mil( "dp:" << dp ); - DiskIterator i = findDisk( dp.first ); - if( (i==dEnd()) || (mby == MOUNTBY_ID && i->udevId().empty()) || - (mby == MOUNTBY_PATH && i->udevPath().empty())) - mby = MOUNTBY_DEVICE; - ret = STORAGE_VOLUME_NOT_FOUND; + + DiskIterator i1 = findDisk(dp.first); + DmPartCoIterator i2 = findDmPartCo(dp.first); + MdPartCoIterator i3 = findMdPartCo(dp.first); + + if (i1 != dEnd()) + { + if ((mby == MOUNTBY_ID && i1->udevId().empty()) || + (mby == MOUNTBY_PATH && i1->udevPath().empty())) + mby = MOUNTBY_DEVICE; + } + else if (i2 != dmpCoEnd()) + { + if ((mby == MOUNTBY_ID && i2->udevId().empty()) || + (mby == MOUNTBY_PATH && i2->udevPath().empty())) + mby = MOUNTBY_DEVICE; + } + else if (i3 != mdpCoEnd()) + { + if ((mby == MOUNTBY_ID && i3->udevId().empty()) || + (mby == MOUNTBY_PATH && i3->udevPath().empty())) + mby = MOUNTBY_DEVICE; + } + else + { + ret = STORAGE_VOLUME_NOT_FOUND; + } } y2milestone( "ret:%d mby:%s", ret, Volume::mbyTypeString(mby).c_str()); return( ret ); Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Mon Jan 25 17:32:59 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 25 17:30:26 CET 2010 - aschnell(a)suse.de + +- fixed default mount-by for multipath (bnc #572209) + +------------------------------------------------------------------- Mon Jan 25 14:12:51 CET 2010 - aschnell(a)suse.de - fixed generation of device names in proposal for partitionable -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60521 - /trunk/wagon/yast2-wagon.spec.in
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 17:16:34 2010 New Revision: 60521 URL: http://svn.opensuse.org/viewcvs/yast?rev=60521&view=rev Log: More explicit RPM requirements Modified: trunk/wagon/yast2-wagon.spec.in Modified: trunk/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/yast2-wagon.spec.in?rev=60… ============================================================================== --- trunk/wagon/yast2-wagon.spec.in (original) +++ trunk/wagon/yast2-wagon.spec.in Mon Jan 25 17:16:34 2010 @@ -6,6 +6,8 @@ # PackagesUI::RunPackageSelector Requires: yast2 >= 2.17.40 Requires: yast2-online-update-frontend >= 2.17.9 +# BNC #571621, Returns <upgrades> section from product file +Requires: yast2-pkg-bindings >= 2.19.1 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60520 - /branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 17:14:08 2010 New Revision: 60520 URL: http://svn.opensuse.org/viewcvs/yast?rev=60520&view=rev Log: More explicit RPM requirements Modified: branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Mon Jan 25 17:14:08 2010 @@ -4,6 +4,8 @@ # PackagesUI::RunPackageSelector Requires: yast2 >= 2.17.40 Requires: yast2-online-update-frontend >= 2.17.9 +# <upgrades> section from product file +Requires: yast2-pkg-bindings >= 2.17.44 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60519 - /tags/branch-Code-11-SP1-2_17_10/samba-server/
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 17:03:58 2010 New Revision: 60519 URL: http://svn.opensuse.org/viewcvs/yast?rev=60519&view=rev Log: Created tag branch-Code-11-SP1-2_17_10 for samba-server Added: tags/branch-Code-11-SP1-2_17_10/samba-server/ (props changed) - copied from r60518, branches/SuSE-Code-11-SP1-Branch/samba-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60518 - in /branches/SuSE-Code-11-SP1-Branch/samba-server: VERSION package/yast2-samba-server.changes src/SambaServer.pm
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 17:03:24 2010 New Revision: 60518 URL: http://svn.opensuse.org/viewcvs/yast?rev=60518&view=rev Log: - Import sets Modified to true (BNC #572670). - 2.17.10 Modified: branches/SuSE-Code-11-SP1-Branch/samba-server/VERSION branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes branches/SuSE-Code-11-SP1-Branch/samba-server/src/SambaServer.pm Modified: branches/SuSE-Code-11-SP1-Branch/samba-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-server/VERSION Mon Jan 25 17:03:24 2010 @@ -1 +1 @@ -2.17.9 +2.17.10 Modified: branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-server/package/yast2-samba-server.changes Mon Jan 25 17:03:24 2010 @@ -1,3 +1,9 @@ +----------------------------------------------------------------- +Mon Jan 25 17:00:20 CET 2010 - locilka(a)suse.cz + +- Import sets Modified to true (BNC #572670). +- 2.17.10 + ------------------------------------------------------------------- Mon Mar 30 15:58:03 CEST 2009 - locilka(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/samba-server/src/SambaServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-server/src/SambaServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-server/src/SambaServer.pm Mon Jan 25 17:03:24 2010 @@ -304,7 +304,7 @@ } else { $GlobalsConfigured = 0; } - $Modified = 0; + $Modified = 1; y2debug("Importing: ", Dumper($settings)); @@ -323,7 +323,8 @@ my ($self) = @_; $GlobalsConfigured = 1 if $self->GetModified(); - $Modified = 0; + # Export does not change the status, only Import and Write + # $Modified = 0; return { version => "2.11", -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60517 - in /branches/SuSE-Code-11-Branch/samba-server: package/yast2-samba-server.changes src/SambaServer.pm
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 17:02:48 2010 New Revision: 60517 URL: http://svn.opensuse.org/viewcvs/yast?rev=60517&view=rev Log: - Import sets Modified to true (BNC #572670). Modified: branches/SuSE-Code-11-Branch/samba-server/package/yast2-samba-server.changes branches/SuSE-Code-11-Branch/samba-server/src/SambaServer.pm Modified: branches/SuSE-Code-11-Branch/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/samba-ser… ============================================================================== --- branches/SuSE-Code-11-Branch/samba-server/package/yast2-samba-server.changes (original) +++ branches/SuSE-Code-11-Branch/samba-server/package/yast2-samba-server.changes Mon Jan 25 17:02:48 2010 @@ -1,3 +1,8 @@ +----------------------------------------------------------------- +Mon Jan 25 17:00:20 CET 2010 - locilka(a)suse.cz + +- Import sets Modified to true (BNC #572670). + ------------------------------------------------------------------- Mon Mar 30 15:58:03 CEST 2009 - locilka(a)suse.cz Modified: branches/SuSE-Code-11-Branch/samba-server/src/SambaServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/samba-ser… ============================================================================== --- branches/SuSE-Code-11-Branch/samba-server/src/SambaServer.pm (original) +++ branches/SuSE-Code-11-Branch/samba-server/src/SambaServer.pm Mon Jan 25 17:02:48 2010 @@ -304,7 +304,7 @@ } else { $GlobalsConfigured = 0; } - $Modified = 0; + $Modified = 1; y2debug("Importing: ", Dumper($settings)); @@ -323,7 +323,8 @@ my ($self) = @_; $GlobalsConfigured = 1 if $self->GetModified(); - $Modified = 0; + # Export does not change the status, only Import and Write + # $Modified = 0; return { version => "2.11", -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60516 - in /trunk/samba-server: package/yast2-samba-server.changes src/SambaServer.pm
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 17:01:54 2010 New Revision: 60516 URL: http://svn.opensuse.org/viewcvs/yast?rev=60516&view=rev Log: - Import sets Modified to true (BNC #572670). Modified: trunk/samba-server/package/yast2-samba-server.changes trunk/samba-server/src/SambaServer.pm Modified: trunk/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba… ============================================================================== --- trunk/samba-server/package/yast2-samba-server.changes (original) +++ trunk/samba-server/package/yast2-samba-server.changes Mon Jan 25 17:01:54 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------ +Mon Jan 25 17:00:20 CET 2010 - locilka(a)suse.cz + +- Import sets Modified to true (BNC #572670). + +------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz - Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su Modified: trunk/samba-server/src/SambaServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/SambaServer.pm?… ============================================================================== --- trunk/samba-server/src/SambaServer.pm (original) +++ trunk/samba-server/src/SambaServer.pm Mon Jan 25 17:01:54 2010 @@ -304,7 +304,7 @@ } else { $GlobalsConfigured = 0; } - $Modified = 0; + $Modified = 1; y2debug("Importing: ", Dumper($settings)); @@ -323,7 +323,8 @@ my ($self) = @_; $GlobalsConfigured = 1 if $self->GetModified(); - $Modified = 0; + # Export does not change the status, only Import and Write + # $Modified = 0; return { version => "2.11", -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0