July 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r64893 - /branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapServer.pm
by rhafer＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: rhafer Date: Tue Jul 19 17:42:59 2011 New Revision: 64893 URL: http://svn.opensuse.org/viewcvs/yast?rev=64893&view=rev Log: Add DB_CONFIG settings to cn=config for first database (bnc#706447) otherwise there'll be no DB_CONFIG when the first database does not use the default directory. Also without the DB_CONFIG settings in cn=config those settings won't be replicated to slave servers. Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapServer.pm Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapServer.pm (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapServer.pm Tue Jul 19 17:42:59 2011 @@ -1903,7 +1903,22 @@ SCR->Write(".ldapserver.database.{1}.limits", \@newlimits ); } } - + + # remove existing DB_CONFIG to have it regenerated at slapd startup from + # settings in the database object + my $db_config = $database->{'directory'}."/DB_CONFIG"; + if ( SCR->Read(".target.size", $db_config) > 0 ) { + SCR->Execute('.target.bash', 'rm -f '.$db_config ); + } + # add DB_CONFIG settings to the database object + my $dbconfig = [ + "set_cachesize 0 15000000 1", + "set_lg_regionmax 262144", + "set_lg_bsize 2097152", + "set_flags DB_LOG_AUTOREMOVE" + ]; + $rc = SCR->Write(".ldapserver.database.{1}.dbconfig", $dbconfig ); + # add default ACLs $rc = SCR->Write(".ldapserver.database.{-1}.acl", $defaultGlobalAcls ); $rc = SCR->Write(".ldapserver.database.{1}.acl", $defaultDbAcls ); -- 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] r64892 - in /branches/SuSE-Code-11-SP2-Branch/storage: libstorage/src/Disk.cc package/yast2-storage.changes
by aschnell＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: aschnell Date: Tue Jul 19 17:23:49 2011 New Revision: 64892 URL: http://svn.opensuse.org/viewcvs/yast?rev=64892&view=rev Log: - fixed size calculation for very small partitions (bnc#705566) Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc Tue Jul 19 17:23:49 2011 @@ -1836,6 +1836,13 @@ { return( p.type()==LOGICAL && p.created() ); } +inline unsigned long +sub_sat(unsigned long a, unsigned long b) +{ + return a - min(a, b); +} + + int Disk::doCreate( Volume* v ) { Partition * p = dynamic_cast<Partition *>(v); @@ -1927,7 +1934,7 @@ { y2mil( "i " << *i ); if( i->cylStart()<maxc && i->cylStart()<end && - i->cylEnd()-fuzz_cyl>p->cylStart() ) + sub_sat(i->cylEnd(), fuzz_cyl) > p->cylStart() ) { maxc=i->cylStart(); y2mil( "new maxc " << maxc ); Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Tue Jul 19 17:23:49 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jul 19 17:17:10 CEST 2011 - aschnell(a)suse.de + +- fixed size calculation for very small partitions (bnc#705566) + +------------------------------------------------------------------- Tue Jul 19 14:18:48 CEST 2011 - fehr(a)suse.de - fix failing testsuite if program without setup_system is first -- 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] r64891 - /branches/SuSE-Code-11-SP2-Branch/ldap-server/src/tree_structure.ycp
by rhafer＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: rhafer Date: Tue Jul 19 16:33:48 2011 New Revision: 64891 URL: http://svn.opensuse.org/viewcvs/yast?rev=64891&view=rev Log: Fixed crash when creating additional database (bnc#706468) Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/tree_structure.ycp Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/tree_structure.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/tree_structure.ycp Tue Jul 19 16:33:48 2011 @@ -558,7 +558,7 @@ } LdapDatabase::ResetCreateBase(); map <string,any> syncrepl = LdapDatabase::GetSyncRepl(); - if ( size(syncrepl) > 0 ) + if ( size(syncrepl) > 0 && size(syncrepl["syncrepl"]:$[]) > 0 ) { list<map<string,string> > dblist = LdapServer::ReadDatabaseList(); integer dbindex=0; @@ -571,12 +571,13 @@ }); if (dbindex > 0) { - if ( ! LdapServer::WriteSyncRepl( dbindex, syncrepl ) ) + if ( ! LdapServer::WriteSyncRepl( dbindex, syncrepl["syncrepl"]:$[] ) ) { map<string, string> err = LdapServer::ReadError(); callback_error = err["msg"]:"" + "\n" + err["details"]:""; return false; } + LdapServer::WriteUpdateRef(dbindex, syncrepl["updateref"]:$[]); } } map <string,any> ppolicy = LdapDatabase::GetPpolicy(); -- 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] r64890 - in /branches/SuSE-Code-11-SP2-Branch/autoinstallation: package/autoyast2.changes src/clients/inst_autoconfigure.ycp
by ug＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: ug Date: Tue Jul 19 14:36:29 2011 New Revision: 64890 URL: http://svn.opensuse.org/viewcvs/yast?rev=64890&view=rev Log: fixed logging for modules that use a list as data structure Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_autoconfigure.ycp Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes Tue Jul 19 14:36:29 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jul 19 14:35:45 CEST 2011 - ug(a)suse.de + +- fixed logging for modules that use a list as data structure + +------------------------------------------------------------------- Thu Jul 14 12:49:58 CEST 2011 - mvidner(a)suse.cz - New profile flag networking/setup_before_proposal enables setting Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_autoconfigure.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_autoconfigure.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_autoconfigure.ycp Tue Jul 19 14:36:29 2011 @@ -205,10 +205,10 @@ else logStep( sformat (_("Not Configuring %1"), p)); if( d["X-SuSE-YaST-AutoLogResource"]:"true" == "true" ) { - y2milestone("Calling auto client with: %1", eval(Profile::current[resource]:$[])); + y2milestone("Calling auto client with: %1", eval(Profile::current[resource]:[])); } else { y2milestone("logging for resource %1 turned off",resource); - y2debug("Calling auto client with: %1", eval(Profile::current[resource]:$[])); + y2debug("Calling auto client with: %1", eval(Profile::current[resource]:[])); } //Call::Function(module_auto, ["Import", eval(Profile::current[resource]:[]) ]); processWait( resource, "pre-modules" ); -- 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] r64889 - /tags/branch-Code-11-SP2-2_17_107/storage/
by fehr＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: fehr Date: Tue Jul 19 14:23:17 2011 New Revision: 64889 URL: http://svn.opensuse.org/viewcvs/yast?rev=64889&view=rev Log: Created tag branch-Code-11-SP2-2_17_107 for storage Added: tags/branch-Code-11-SP2-2_17_107/storage/ (props changed) - copied from r64888, branches/SuSE-Code-11-SP2-Branch/storage/ -- 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] r64888 - /tags/branch-Code-11-SP2-2_17_107/
by fehr＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: fehr Date: Tue Jul 19 14:23:15 2011 New Revision: 64888 URL: http://svn.opensuse.org/viewcvs/yast?rev=64888&view=rev Log: Created tag branch-Code-11-SP2-2_17_107 Added: tags/branch-Code-11-SP2-2_17_107/ -- 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] r64887 - in /branches/SuSE-Code-11-SP2-Branch/storage: VERSION libstorage/src/Storage.cc libstorage/testsuite/libstorage.test/single_test.exp package/yast2-storage.changes
by fehr＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: fehr Date: Tue Jul 19 14:23:05 2011 New Revision: 64887 URL: http://svn.opensuse.org/viewcvs/yast?rev=64887&view=rev Log: - fix failing testsuite if program without setup_system is first - version 2.17.107 Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/testsuite/libstorage.test/single_test.exp branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/VERSION Tue Jul 19 14:23:05 2011 @@ -1 +1 @@ -2.17.106 +2.17.107 Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc Tue Jul 19 14:23:05 2011 @@ -906,7 +906,7 @@ void Storage::logContainersAndVolumes(const string& Dir) const { - if (max_log_num > 0) + if (max_log_num > 0 && checkDir(Dir)) { for (CCIter i = cont.begin(); i != cont.end(); ++i) (*i)->logData(Dir); Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/testsuite/libstorage.test/single_test.exp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/testsuite/libstorage.test/single_test.exp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/testsuite/libstorage.test/single_test.exp Tue Jul 19 14:23:05 2011 @@ -7,7 +7,7 @@ # get all files matching *.single -if { [catch { set filenames [glob $srcdir/*.single] } ] } { +if { [catch { set filenames [ lsort [glob $srcdir/*.single]] } ] } { puts "No .single files found" } else { # foreach file, call single-run (from testsuite/lib) Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Tue Jul 19 14:23:05 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jul 19 14:18:48 CEST 2011 - fehr(a)suse.de + +- fix failing testsuite if program without setup_system is first +- version 2.17.107 + +------------------------------------------------------------------- Wed Jul 6 16:57:07 CEST 2011 - fehr(a)suse.de - changed ext4 to unsupported -- 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] r64886 - in /branches/SuSE-Code-11-SP1-Branch/bootloader: VERSION package/yast2-bootloader.changes src/modules/BootCommon.ycp src/routines/lib_iface.ycp src/routines/misc.ycp
by snwint＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: snwint Date: Tue Jul 19 14:20:00 2011 New Revision: 64886 URL: http://svn.opensuse.org/viewcvs/yast?rev=64886&view=rev Log: - fix using uuid names (bnc #594482, bnc #687878, bnc #704101) Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lib_iface.ycp branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION Tue Jul 19 14:20:00 2011 @@ -1 +1 @@ -2.17.73 +2.17.74 Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Tue Jul 19 14:20:00 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jul 19 14:13:52 CEST 2011 - snwint(a)suse.de + +- fix using uuid names (bnc #594482, bnc #687878, bnc #704101) +- 2.17.74 + +------------------------------------------------------------------- Thu May 6 12:33:08 CEST 2010 - juhliarik(a)suse.cz - added fix for deleting gfxmenu in console is defined (bnc#602743) Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp Tue Jul 19 14:20:00 2011 @@ -100,6 +100,33 @@ */ global map<string,string> multipath_mapping = $[]; +// it is ugly hack because y2-storage doesn't known to indicate +// that it finish (create partitions) proposed partitioning +// of disk in installation +/** bnc#687878 - mountby uuid not respected in menu.lst + * Indicate if storage already finish partitioning of disk + * if some partition includes any keyword "create" + * the value is the first found partition with flag "create" e.g. /dev/sda2 + * empty string means all partitions are created + */ +string proposed_partition = ""; + +/** bnc#687878 - mountby uuid not respected in menu.lst + * 0 - if all devices in variable all_devices are created. + * 1 - if partition with flag "create" was found in MapDevices() + * 2 - if proposed_partition was created or flag "create" was deleted + * by y2-storage. the value is set in CheckProposedPartition () + */ +integer all_devices_created = 0; + +/** bnc#687878 - mountby uuid not respected in menu.lst + * 0 - if all devices in variable all_partitions and all_disks are created + * 1 - if partition with flag "create" was found in MapDevices() + * 2 - if proposed_partition was created or flag "create" was deleted + * by y2-storage. the value is set in CheckProposedPartition () + */ +integer all_partitions_created = 0; + /** * Flag indicates that bios_id_missing in disk * true if missing false if at least one disk has bios_id Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lib_iface.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lib_iface.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lib_iface.ycp Tue Jul 19 14:20:00 2011 @@ -149,6 +149,7 @@ if (!force && loader == library_initialized) return false; + InitMapDevices (); y2milestone ("Initializing lib for %1", loader); System::Bootloader_API::setLoaderType (loader); y2milestone ("Putting partitioning into library"); Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp Tue Jul 19 14:20:00 2011 @@ -211,6 +211,14 @@ foreach (map p, (list<map>)(v["partitions"]:[]), { + // bnc#687878 - mountby uuid not respected in menu.lst + // if there is "not created" partition and flag for "it" is not set + if ((p["create"]:nil == true) && (Mode::installation())) + { + if (BootCommon::proposed_partition == "") + BootCommon::proposed_partition = p["device"]:""; + BootCommon::all_devices_created = 1; + } // map partition by uuid if ((p["uuid"]:nil != "") && (p["uuid"]:nil != nil)) { @@ -242,6 +250,12 @@ }); // end of foreach (map p, (list<map>)(v["partitions"]:[]), }); // end of foreach (string k, map v, devices, + if (Mode::installation() && BootCommon::all_devices_created == 2) + { + BootCommon::all_devices_created = 0; + y2milestone("set status for all_devices to \"created\""); + } + y2milestone("disks mapping by-id: %1", id_disks); y2milestone("disks mapping by-uuid: %1", uuid_disks); y2milestone("disks mapping by-path: %1", path_disks); @@ -582,6 +596,107 @@ return temp_sec; } +/** bnc#687878 - mountby uuid not respected in menu.lst + * Function check if proposed_partition still includes + * flag "create" + * + * @param map<string,map> tm + * @return true if partition is still not created + */ + +boolean CheckProposedPartition (map<string,map> tm) +{ + + boolean ret = true; + if (!Mode::installation()) + { + y2debug("Skip CheckProposedPartition() -> it is not running installation"); + return false; + } + if (size(tm) == 0 || BootCommon::proposed_partition == "") + { + y2debug("proposed_partition is empty: %1", BootCommon::proposed_partition); + return false; + } + map dp = Storage::GetDiskPartition (proposed_partition); + string disk = dp["disk"]:""; + list <map> partitions = (list<map>)tm[disk,"partitions"]:[]; + foreach (map p, partitions, + { + if (p["device"]:"" == BootCommon::proposed_partition) + { + if (p["create"]:nil != true) + { + BootCommon::proposed_partition = ""; + y2milestone("proposed_partition is already created: %1", p); + if (BootCommon::all_devices_created == 1) + BootCommon::all_devices_created = 2; + if (BootCommon::all_partitions_created == 1) + BootCommon::all_partitions_created = 2; + ret = false; + } else { + y2milestone("proposed_partition: %1 is NOT created", BootCommon::proposed_partition); + } + break; + } + }); + return ret; +} + +/** bnc#687878 - mountby uuid not respected in menu.lst + * Check if it is necessary rebuild all_devices + * + * @return true -> rebuild all_devices + */ + +boolean RebuildMapDevices() +{ + boolean ret = false; + boolean ret_CheckProposedPartition = CheckProposedPartition((map<string,map>)Storage::GetTargetMap()); + + if (!ret_CheckProposedPartition && BootCommon::all_devices_created == 2) + return true; + + return ret; +} + +/** bnc#687878 - mountby uuid not respected in menu.lst + * Init and fullfil internal data for perl-Bootloader + * + * @return true if init reset/fullfil data or false and used cached data + */ + +global boolean InitMapDevices () +{ + boolean ret = false; + if (saved_last_change_time_from_storage != Storage::GetTargetChangeTime() || RebuildMapDevices()) + { + y2milestone("Init internal data from storage"); + MapDevices(); + saved_last_change_time_from_storage = Storage::GetTargetChangeTime(); + ret = true; + } + + return ret; +} + +/** bnc#687878 - mountby uuid not respected in menu.lst + * Check if it is necessary rebuild all_partitions and all_disks + * + * @return true -> rebuild all_partitions and all_disks + */ + +boolean RebuildMapAllPartitions() +{ + boolean ret = false; + boolean ret_CheckProposedPartition = CheckProposedPartition((map<string,map>)Storage::GetTargetMap()); + + if (!ret_CheckProposedPartition && BootCommon::all_partitions_created == 2) + return true; + + return ret; +} + /** * bnc #468922 - problem with longtime running the parsing a huge number of disks * Function initialize BootCommon::all_partitions only if storage change @@ -592,7 +707,10 @@ boolean MapAllPartitions() { boolean ret = false; - if (saved_last_change_time_from_storage != Storage::GetTargetChangeTime()) + if ((saved_last_change_time_from_storage != Storage::GetTargetChangeTime()) + || (size(BootCommon::all_partitions) < 1) + || (size(BootCommon::target_map) < 1) + || RebuildMapAllPartitions()) { // save last change time from storage for MapAllPartitions() saved_last_change_time_from_storage = Storage::GetTargetChangeTime(); @@ -606,11 +724,24 @@ { foreach (map p, (list<map>)(v["partitions"]:[]), { + // bnc#687878 - mountby uuid not respected in menu.lst + // if there is "not created" partition and flag for "it" is not set + if ((p["create"]:nil == true) && (Mode::installation())) + { + if (BootCommon::proposed_partition == "") + BootCommon::proposed_partition = p["device"]:""; + BootCommon::all_partitions_created = 1; + } all_partitions[p["device"]:""] = p; }); }); ret = true; } + if (Mode::installation() && BootCommon::all_partitions_created == 2) + { + BootCommon::all_partitions_created = 0; + y2milestone("set status for all_partitions to \"created\""); + } return ret; } -- 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] r64885 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp
by gs＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: gs Date: Tue Jul 19 14:14:01 2011 New Revision: 64885 URL: http://svn.opensuse.org/viewcvs/yast?rev=64885&view=rev Log: enable creation of /etc/sysconfig/network configuration (makes sense to write config file) Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Tue Jul 19 14:14:01 2011 @@ -274,7 +274,7 @@ boolean create_ifcfg = false; string ifcfg_file = ""; - if ( Stage::initial() ) // first stage - create and start FCoE VLAN interface + if ( Stage::initial() ) // first stage of installation - create and start FCoE VLAN interface { // headline of a popup: creating and starting Fibre Channel over Ethernet boolean ret = Popup::YesNoHeadline( _("Creating and starting FCoE on detected VLAN device"), @@ -332,13 +332,13 @@ else { command = sformat( "fipvlan -c -s %1", dev_name ); // create and start FCoE - // create_ifcfg = true; + create_ifcfg = true; } } else { command = sformat( "fipvlan -c -s %1", dev_name ); - // create_ifcfg = true; + create_ifcfg = true; } y2milestone( "Executing command: %1", command ); -- 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] r64884 - /tags/stable-2_21_4/fcoe-client/
by gs＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: gs Date: Tue Jul 19 14:09:44 2011 New Revision: 64884 URL: http://svn.opensuse.org/viewcvs/yast?rev=64884&view=rev Log: Created tag stable-2_21_4 for fcoe-client Added: tags/stable-2_21_4/fcoe-client/ - copied from r64883, trunk/fcoe-client/ -- 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] r64883 - in /trunk/fcoe-client: VERSION package/yast2-fcoe-client.changes
by gs＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: gs Date: Tue Jul 19 14:09:12 2011 New Revision: 64883 URL: http://svn.opensuse.org/viewcvs/yast?rev=64883&view=rev Log: 2.21.4 Modified: trunk/fcoe-client/VERSION trunk/fcoe-client/package/yast2-fcoe-client.changes Modified: trunk/fcoe-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/VERSION?rev=64883&r1… ============================================================================== --- trunk/fcoe-client/VERSION (original) +++ trunk/fcoe-client/VERSION Tue Jul 19 14:09:12 2011 @@ -1 +1 @@ -2.21.3 +2.21.4 Modified: trunk/fcoe-client/package/yast2-fcoe-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/package/yast2-fcoe-c… ============================================================================== --- trunk/fcoe-client/package/yast2-fcoe-client.changes (original) +++ trunk/fcoe-client/package/yast2-fcoe-client.changes Tue Jul 19 14:09:12 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jul 19 14:08:23 CEST 2011 - gs(a)suse.de + +- AutoYaST support added +- V 2.21.4 + +------------------------------------------------------------------- Tue Jun 7 13:39:51 CEST 2011 - gs(a)suse.de - Bug-fixes for installation workflow (reset network cards, only -- 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] r64882 - in /trunk/fcoe-client/src: FcoeClient.ycp fcoe-client_auto.ycp fcoe-client_finish.ycp
by gs＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: gs Date: Tue Jul 19 14:08:03 2011 New Revision: 64882 URL: http://svn.opensuse.org/viewcvs/yast?rev=64882&view=rev Log: AutoYaST support added Modified: trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/fcoe-client_auto.ycp trunk/fcoe-client/src/fcoe-client_finish.ycp Modified: trunk/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/FcoeClient.ycp?r… ============================================================================== --- trunk/fcoe-client/src/FcoeClient.ycp (original) +++ trunk/fcoe-client/src/FcoeClient.ycp Tue Jul 19 14:08:03 2011 @@ -43,6 +43,7 @@ import "Package"; import "Popup"; import "Service"; +import "NetworkService"; /** * Prototypes @@ -645,6 +646,8 @@ string syslog_val = (string)SCR::Read(add(.fcoe, "USE_SYSLOG")); fcoe_general_config = add( fcoe_general_config, "USE_SYSLOG", syslog_val ); + y2milestone( "/etc/fcoe/config read - DEBUG: %1, USE_SYSLOG: %2", debug_val, syslog_val ); + return true; } @@ -683,7 +686,7 @@ card["fcoe_vlan"]:"" != FcoeClient::NOT_CONFIGURED && Modified() ) // and data are modified { string content = (string)SCR::Read( .target.string, card["cfg_file"]:"" ); - y2milestone( "Original content of %1: %2", card["cfg_file"]:"", content ); + y2debug( "Original content of %1: %2", card["cfg_file"]:"", content ); list <string> lines = (list<string>)splitstring( content, "\n" ); lines = maplist( string line, lines, { @@ -701,7 +704,7 @@ } }); content = mergestring( lines, "\n" ); - y2milestone( "Modified content: %1", content ); + y2milestone( "Writing content: %1", content ); boolean ret = SCR::Write( .target.string, card["cfg_file"]:"", content ); if ( !ret ) @@ -714,10 +717,6 @@ y2milestone( "%1 written", card["cfg_file"]:"" ); } } - else - { - y2milestone( "%1 not configured for FCoE", card["dev_name"]:"" ); - } } ); return success; @@ -775,8 +774,8 @@ "" ); - // TODO - is this check needed here (like in IsciClient.ycp) - // if(!NetworkService::RunningNetworkPopup()) return false; + // check if network services are running + if(!NetworkService::RunningNetworkPopup()) return false; if(PollAbort()) return false; Progress::NextStage(); @@ -866,12 +865,13 @@ ], "" ); - // TODO things to do in case of Mode::autoinst()/autoupgrade() ??? - // see IscsiClient.ycp, line 236, 241 - // TODO is_running - used or obsolete ??? + // iscsi-client prepares for AutoYaST in Mode::autoinst()/autoupgrade() + // (see IscsiClient.ycp, line 236, 241) + // These things are done in fcoe-client_auto.ycp (should be sufficient there) + boolean is_running = Progress::IsRunning(); - y2milestone( "**** Progress still running: %1", is_running ); + y2debug( "**** Progress still running: %1", is_running ); // write settings if(PollAbort()) return false; @@ -902,7 +902,8 @@ // adjust start status of services lldpad and fcoe AdjustStartStatus(); - // TODO - add additional package ??? like in IscsiClient.ycp, line 257 + // Adding additional package (like in IscsiClient.ycp, line 257) + // is done in inst_fcoe-client.ycp (PackagesProposal::AddResolvables) sleep(sl); if(PollAbort()) return false; @@ -964,16 +965,12 @@ summary = Summary::AddLine( summary, _("Interfaces") ); netcards = FcoeClient::GetNetworkCards(); foreach ( map card, netcards, { - summary = Summary::AddLine( summary, sformat( "%1: %2 %3: %4 %5: %6 %7: %8", + summary = Summary::AddLine( summary, sformat( "%1: %2 %3: %4", // network card, e.g. eth0 _("Netcard:"), card["dev_name"]:"", // nothing to translate here (abbreviation for // Fibre Channel over Ethernet Virtual LAN interface) - "FCoE VLAN", card["fcoe_vlan"]:"", - // nothing to translate, options from config file - "FCOE_ENABLE", card["fcoe_enable"]:"", - "DCB_REQUIRED", card["dcb_required"]:"" ) ); - + "FCoE VLAN", card["fcoe_vlan"]:"" ) ); } ); service_start = FcoeClient::GetStartStatus(); summary = Summary::AddLine( summary, _("Starting of services") ); Modified: trunk/fcoe-client/src/fcoe-client_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/fcoe-client_auto… ============================================================================== --- trunk/fcoe-client/src/fcoe-client_auto.ycp (original) +++ trunk/fcoe-client/src/fcoe-client_auto.ycp Tue Jul 19 14:08:03 2011 @@ -96,86 +96,139 @@ /* Write given settings */ else if (func == "Write") { import "Progress"; - boolean write = true; boolean progress_orig = Progress::set (false); - // prepare for AutoYaST: check imported data and if required create the - // FCoE VLAN interfaces before calling FCoEClient::Write() - - list<map> netcards = FcoeClient::GetNetworkCards(); - y2milestone( "Netcards: %1", netcards ); + boolean success = true; + boolean start_fcoe = false; + list<map> detected_netcards = []; + integer index = 0; - foreach ( map card, netcards, { - string vlan_interface = ""; - string fcoe_vlan_interface = ""; - string command = ""; - map output = $[]; - string ifcfg_file = ""; - - if ( card["fcoe_vlan"]:"" != FcoeClient::NOT_AVAILABLE && - card["fcoe_vlan"]:"" != FcoeClient::NOT_CONFIGURED ) - { - ifcfg_file = sformat( "/etc/sysconfig/network/ifcfg-%1\.%2", card["dev_name"]:"", card["vlan_interface"]:"" ); - - // if /etc/sysconfig/network/ifcfg-<vlan-interface> already exists - // call 'ifup' for the interface (creates /proc/net/vlan/<vlan-interface>) - if ( FileUtils::Exists( ifcfg_file ) ) - { - command = sformat( "ifup %1\.%2", card["dev_name"]:"", card["vlan_interface"]:"" ); - y2milestone( "Executing command: %1", command ); - output = (map)SCR::Execute( .target.bash_output, command ); - y2milestone( "Output: %1", output ); + // prepare for AutoYaST + list<map> imported_netcards = FcoeClient::GetNetworkCards(); + y2milestone( "Imported information about netcards: %1", imported_netcards ); + + // AutoYaST will install package 'open-fcoe' ( checks AutoPackages() ) - if ( output["exit"]:255 == 0 ) - { - // start FCoE - command = sformat( "fipvlan -s %1", card["dev_name"]:"" ); - } - } - else // create VLAN interface and start FCoE + // Start services 'fcoe' and 'lldpad' + success = FcoeClient::ServiceStatus(); + if ( success ) + { + y2milestone( "Services fcoe and lldpad started" ); + } + else + { + y2error( "Cannot start services - stopping auto installation" ); + return false; + } + // Reset info about netcards and get current values + FcoeClient::ResetNetworkCards(); + success = FcoeClient::DetectNetworkCards(); + if ( success ) + { + detected_netcards = FcoeClient::GetNetworkCards(); + y2milestone( "Information about detected netcards: %1", detected_netcards ); + } + else + { + y2error( "Cannot detect network cards - stopping auto installation" ); + return false; + } + + // Check imported data + foreach ( map card, imported_netcards, { + if ( card["fcoe_vlan"]:"" != FcoeClient::NOT_AVAILABLE && + card["fcoe_vlan"]:"" != FcoeClient::NOT_CONFIGURED ) { - command = sformat( "fipvlan -c -s %1", card["dev_name"]:"" ); - y2milestone( "Executing command: %1", command ); - output = (map)SCR::Execute( .target.bash_output, command ); - y2milestone( "Output: %1", output ); + // any FCoE VLAN interface is configured + start_fcoe = true; } - - if ( output["exit"]:255 != 0 ) - { - y2error( "Cannot create and start FCoE on %1", card["dev_name"]:"" ); - write = false; // don't write configuration - } - else - { - // check FCoE VLAN interface - vlan_interface = FcoeClient::GetVlanInterface( card["dev_name"]:"" ); - fcoe_vlan_interface = FcoeClient::GetFcoeVlanInterface( card["dev_name"]:"", - vlan_interface ); - if ( fcoe_vlan_interface != card["fcoe_vlan"]:"" ) - { - y2error( "FCoE VLAN interfaces differ. Created: %1, imported: %2", - fcoe_vlan_interface, card["fcoe_vlan"]:"" ); - write = false; // don't write configuration - } - else + } ); + + // If any FcoE interface is found in imported data we try to start FCoE + // for all interfaces which are not yet configured, i.e. where starting of + // FCoE is possible. We can not start exactly the interface from imported + // data because the numeration of interfaces (eth0, eth1...) may differ. + if ( start_fcoe ) + { + foreach ( map card, detected_netcards, { + string vlan_interface = ""; + string fcoe_vlan_interface = ""; + string command = ""; + map output = $[]; + string ifcfg_file = ""; + map status_map = $[]; + + if ( card["fcoe_vlan"]:"" == FcoeClient::NOT_CONFIGURED ) { - // read or create /etc/fcoe/ethx file - FcoeClient::GetFCoEStatus( fcoe_vlan_interface ); - } - } - } - }); + ifcfg_file = sformat( "/etc/sysconfig/network/ifcfg-%1\.%2", card["dev_name"]:"", + card["vlan_interface"]:"" ); + // if /etc/sysconfig/network/ifcfg-<vlan-interface> already exists + // call 'ifup' for the interface (creates /proc/net/vlan/<vlan-interface>) + if ( FileUtils::Exists( ifcfg_file ) ) + { + command = sformat( "ifup %1\.%2", card["dev_name"]:"", card["vlan_interface"]:"" ); + y2milestone( "Executing command: %1", command ); + output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output ); - if ( write ) - { - // FcoeClient::SetModified(true) is called in FcoeClient::Import(), - // i.e. modified is set before calling FcoeClient::Write() - ret = FcoeClient::Write(); - } - else // don't continue in case of error - { - ret = false; + if ( output["exit"]:255 == 0 ) + { + // start FCoE + command = sformat( "fipvlan -s %1", card["dev_name"]:"" ); + } + } + else // create VLAN interface and start FCoE + { + command = sformat( "fipvlan -c -s %1", card["dev_name"]:"" ); + y2milestone( "Executing command: %1", command ); + output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output ); + } + + if ( output["exit"]:255 != 0 ) + { + y2error( "Cannot create and start FCoE on %1", card["dev_name"]:"" ); + } + else // get FCoE VLAN interface + { + vlan_interface = FcoeClient::GetVlanInterface( card["dev_name"]:"" ); + if ( vlan_interface == "" ) + { + y2error( "VLAN interface not available for %1.", card["dev_name"]:"" ); + } + else + { + fcoe_vlan_interface = FcoeClient::GetFcoeVlanInterface( card["dev_name"]:"", + vlan_interface ); + if ( fcoe_vlan_interface != "" ) + { + y2milestone( "FCoE VLAN interface %1 created/started", fcoe_vlan_interface ); + // read or create /etc/fcoe/ethx file + status_map = FcoeClient::GetFCoEStatus( fcoe_vlan_interface ); + // apply modified data + detected_netcards[ index, "fcoe_vlan"] = fcoe_vlan_interface; + detected_netcards[ index, "cfg_file"] = status_map["Filename"]:""; + detected_netcards[ index, "fcoe_enable"] = status_map["FCOE_ENABLE"]:""; + detected_netcards[ index, "dcb_required"] = status_map["DCB_REQUIRED"]:""; + } + else + { + y2error( "FCoE VLAN interface not configured for %1", card["dev_name"]:"" ); + } + } + } + } + index = index + 1; + }); } + y2milestone( "Set NEW information about network cards: %1", detected_netcards ); + // Set new information about netcards + FcoeClient::SetNetworkCards( detected_netcards ); + + // FcoeClient::SetModified(true) is called in FcoeClient::Import(), + // i.e. modified is set before calling FcoeClient::Write() + ret = FcoeClient::Write(); + Progress::set (progress_orig); } /** Modified: trunk/fcoe-client/src/fcoe-client_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/fcoe-client_fini… ============================================================================== --- trunk/fcoe-client/src/fcoe-client_finish.ycp (original) +++ trunk/fcoe-client/src/fcoe-client_finish.ycp Tue Jul 19 14:08:03 2011 @@ -58,17 +58,17 @@ if ( card["fcoe_vlan"]:"" != FcoeClient::NOT_AVAILABLE && card["fcoe_vlan"]:"" != FcoeClient::NOT_CONFIGURED ) { - // FCoE VLAN interface is configured + // FCoE VLAN interface is configured -> start services start_services = true; } } ); + if ( start_services ) { + y2milestone( "Enabling service start of fcoe and lldpad" ); Service::Enable("fcoe"); Service::Enable("lldpad"); } - y2milestone("fcoe and lldpad services enabled"); - } else { -- 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] r64881 - in /branches/SuSE-Code-11-SP2-Branch/storage: libstorage/src/Storage.cc storage/src/include/ep-settings.ycp storage/src/modules/Partitions.ycp
by aschnell＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: aschnell Date: Tue Jul 19 12:14:15 2011 New Revision: 64881 URL: http://svn.opensuse.org/viewcvs/yast?rev=64881&view=rev Log: - allow btrfs as default filesystem Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-settings.ycp branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Partitions.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc Tue Jul 19 12:14:15 2011 @@ -191,7 +191,7 @@ if (!toValue(val, fs_type, false)) y2war("unknown default filesystem '" << val << "' in " SYSCONFIGFILE); else if (fs_type != EXT2 && fs_type != EXT3 && fs_type != EXT4 && - fs_type != REISERFS && fs_type != XFS) + fs_type != REISERFS && fs_type != XFS && fs_type != BTRFS) y2war("unallowed default filesystem '" << val << "' in " SYSCONFIGFILE); else setDefaultFs(fs_type); Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-settings.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-settings.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-settings.ycp Tue Jul 19 12:14:15 2011 @@ -63,7 +63,7 @@ return `item(`id(item_id), label); }); - list<symbol> filesystems = filter(symbol fs, [ `ext2, `ext3, `ext4, `reiser, `xfs ], { + list<symbol> filesystems = filter(symbol fs, [ `ext2, `ext3, `ext4, `reiser, `xfs, `btrfs ], { return FileSystems::IsSupported(fs) && !FileSystems::IsUnsupported(fs); }); Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Partitions.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Partitions.ycp Tue Jul 19 12:14:15 2011 @@ -120,7 +120,7 @@ if (default_fs == `unknown) { string tmp = (string) SCR::Read(.sysconfig.storage.DEFAULT_FS); - if (tmp == nil || !contains([ "ext2", "ext3", "ext4", "reiser", "xfs" ], tolower(tmp))) + if (tmp == nil || !contains([ "ext2", "ext3", "ext4", "reiser", "xfs", "btrfs" ], tolower(tmp))) tmp = "ext3"; default_fs = tosymbol(tolower(tmp)); -- 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] r64880 - in /trunk/storage/storage/src: include/ep-settings.ycp modules/Partitions.ycp
by aschnell＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: aschnell Date: Tue Jul 19 12:14:06 2011 New Revision: 64880 URL: http://svn.opensuse.org/viewcvs/yast?rev=64880&view=rev Log: - allow btrfs as default filesystem Modified: trunk/storage/storage/src/include/ep-settings.ycp trunk/storage/storage/src/modules/Partitions.ycp Modified: trunk/storage/storage/src/include/ep-settings.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-s… ============================================================================== --- trunk/storage/storage/src/include/ep-settings.ycp (original) +++ trunk/storage/storage/src/include/ep-settings.ycp Tue Jul 19 12:14:06 2011 @@ -63,8 +63,8 @@ return `item(`id(item_id), label); }); - list<symbol> filesystems = filter(symbol fs, [ `ext2, `ext3, `ext4, `reiser, `xfs ], { - return FileSystems::IsSupported(fs) && !FileSystems::IsUnsupported(fs); + list<symbol> filesystems = filter(symbol fs, [ `ext2, `ext3, `ext4, `reiser, `xfs, `btrfs ], { + return FileSystems::IsSupported(fs) && !FileSystems::IsUnsupported(fs); }); list<term> filesystem_items = maplist(symbol fs, filesystems, { Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Part… ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Tue Jul 19 12:14:06 2011 @@ -120,7 +120,7 @@ if (default_fs == `unknown) { string tmp = (string) SCR::Read(.sysconfig.storage.DEFAULT_FS); - if (tmp == nil || !contains([ "ext2", "ext3", "ext4", "reiser", "xfs" ], tolower(tmp))) + if (tmp == nil || !contains([ "ext2", "ext3", "ext4", "reiser", "xfs", "btrfs" ], tolower(tmp))) tmp = "ext4"; default_fs = tosymbol(tolower(tmp)); -- 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] r64879 - in /trunk/s390/src: clients/dasd_auto.ycp clients/zfcp_auto.ycp modules/DASDController.ycp modules/ZFCPController.ycp
by aschnell＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: aschnell Date: Mon Jul 18 16:34:38 2011 New Revision: 64879 URL: http://svn.opensuse.org/viewcvs/yast?rev=64879&view=rev Log: - include add devices in summary Modified: trunk/s390/src/clients/dasd_auto.ycp trunk/s390/src/clients/zfcp_auto.ycp trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/clients/dasd_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/dasd_auto.ycp?r… ============================================================================== --- trunk/s390/src/clients/dasd_auto.ycp (original) +++ trunk/s390/src/clients/dasd_auto.ycp Mon Jul 18 16:34:38 2011 @@ -27,6 +27,7 @@ y2milestone("DASD auto started"); import "DASDController"; + import "HTML"; include "s390/dasd/wizards.ycp"; any ret = nil; @@ -44,7 +45,7 @@ /* Create a summary*/ if(func == "Summary") { - ret = select(DASDController::Summary(), 0, ""); + ret = HTML::List(DASDController::Summary()); } /* Reset configuration */ else if (func == "Reset") { Modified: trunk/s390/src/clients/zfcp_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/zfcp_auto.ycp?r… ============================================================================== --- trunk/s390/src/clients/zfcp_auto.ycp (original) +++ trunk/s390/src/clients/zfcp_auto.ycp Mon Jul 18 16:34:38 2011 @@ -27,6 +27,7 @@ y2milestone("ZFCP auto started"); import "ZFCPController"; + import "HTML"; include "s390/zfcp/wizards.ycp"; any ret = nil; @@ -44,7 +45,7 @@ /* Create a summary*/ if(func == "Summary") { - ret = select(ZFCPController::Summary(), 0, ""); + ret = HTML::List(ZFCPController::Summary()); } /* Reset configuration */ else if (func == "Reset") { Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Mon Jul 18 16:34:38 2011 @@ -224,7 +224,8 @@ * Create a textual summary and a list of unconfigured cards * @return summary of the current configuration */ -global list Summary() { +global list<string> Summary() +{ list<string> ret = maplist (integer index, map<string,any> d, devices, { string s = ""; // summary text, %1 is channel ID (number), Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Mon Jul 18 16:34:38 2011 @@ -205,7 +205,8 @@ * Create a textual summary and a list of unconfigured cards * @return summary of the current configuration */ -global list<string> Summary() { +global list<string> Summary() +{ list<string> ret = maplist (integer index, map<string,any> d, devices, { // summary text, %1 is channel ID, %1 is WWPN, %3 is LUN // (all of them are numbers) -- 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] r64878 - in /branches/SuSE-Code-11-SP2-Branch/s390/src: clients/dasd_auto.ycp clients/zfcp_auto.ycp modules/DASDController.ycp modules/ZFCPController.ycp
by aschnell＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: aschnell Date: Mon Jul 18 16:33:43 2011 New Revision: 64878 URL: http://svn.opensuse.org/viewcvs/yast?rev=64878&view=rev Log: - include all devices in summary Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/clients/dasd_auto.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/clients/zfcp_auto.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/modules/DASDController.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/modules/ZFCPController.ycp Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/clients/dasd_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/clients/dasd_auto.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/clients/dasd_auto.ycp Mon Jul 18 16:33:43 2011 @@ -27,6 +27,7 @@ y2milestone("DADS auto started"); import "DASDController"; + import "HTML"; include "s390/dasd/wizards.ycp"; any ret = nil; @@ -44,7 +45,7 @@ /* Create a summary*/ if(func == "Summary") { - ret = select(DASDController::Summary(), 0, ""); + ret = HTML::List(DASDController::Summary()); } /* Reset configuration */ else if (func == "Reset") { Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/clients/zfcp_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/clients/zfcp_auto.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/clients/zfcp_auto.ycp Mon Jul 18 16:33:43 2011 @@ -27,6 +27,7 @@ y2milestone("DADS auto started"); import "ZFCPController"; + import "HTML"; include "s390/zfcp/wizards.ycp"; any ret = nil; @@ -44,7 +45,7 @@ /* Create a summary*/ if(func == "Summary") { - ret = select(ZFCPController::Summary(), 0, ""); + ret = HTML::List(ZFCPController::Summary()); } /* Reset configuration */ else if (func == "Reset") { Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/modules/DASDController.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/modules/DASDController.ycp Mon Jul 18 16:33:43 2011 @@ -225,7 +225,8 @@ * Create a textual summary and a list of unconfigured cards * @return summary of the current configuration */ -global list Summary() { +global list<string> Summary() +{ list<string> ret = maplist (integer index, map<string,any> d, devices, { string s = ""; // summary text, %1 is channel ID (number), Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/modules/ZFCPController.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/modules/ZFCPController.ycp Mon Jul 18 16:33:43 2011 @@ -205,7 +205,8 @@ * Create a textual summary and a list of unconfigured cards * @return summary of the current configuration */ -global list<string> Summary() { +global list<string> Summary() +{ list<string> ret = maplist (integer index, map<string,any> d, devices, { // summary text, %1 is channel ID, %1 is WWPN, %3 is LUN // (all of them are numbers) -- 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] r64877 - /tags/branch-Code-11-SP2-2_17_38/ldap-server/
by rhafer＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: rhafer Date: Mon Jul 18 15:44:30 2011 New Revision: 64877 URL: http://svn.opensuse.org/viewcvs/yast?rev=64877&view=rev Log: Created tag branch-Code-11-SP2-2_17_38 for ldap-server Added: tags/branch-Code-11-SP2-2_17_38/ldap-server/ (props changed) - copied from r64876, branches/SuSE-Code-11-SP2-Branch/ldap-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] r64876 - in /branches/SuSE-Code-11-SP2-Branch/ldap-server: VERSION package/yast2-ldap-server.changes
by rhafer＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: rhafer Date: Mon Jul 18 15:31:52 2011 New Revision: 64876 URL: http://svn.opensuse.org/viewcvs/yast?rev=64876&view=rev Log: preparing 2.17.38 Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/VERSION branches/SuSE-Code-11-SP2-Branch/ldap-server/package/yast2-ldap-server.changes Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/VERSION Mon Jul 18 15:31:52 2011 @@ -1 +1 @@ -2.17.37 +2.17.38 Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/package/yast2-ldap-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/package/yast2-ldap-server.changes Mon Jul 18 15:31:52 2011 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Jul 18 13:07:51 UTC 2011 - rhafer(a)suse.de + +- Version 2.17.38 +- fixed typos (bnc#703175, bnc#692812) +- Allow to select a CA Certificate when setting up a slave + (bnc#706447) + +------------------------------------------------------------------- Wed Jun 22 12:09:35 UTC 2011 - rhafer(a)suse.de - Version 2.17.37 -- 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] r64875 - in /branches/SuSE-Code-11-SP2-Branch/ldap-server/src: agent/SlapdConfigAgent.cc dialogs.ycp
by rhafer＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: rhafer Date: Mon Jul 18 15:31:49 2011 New Revision: 64875 URL: http://svn.opensuse.org/viewcvs/yast?rev=64875&view=rev Log: Allow to set a CA Certificate when setting up a slave (bnc#706447) Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/agent/SlapdConfigAgent.cc branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/agent/SlapdConfigAgent.cc Mon Jul 18 15:31:49 2011 @@ -203,6 +203,11 @@ } else { + TlsOptions tls = m_lc->getTlsOptions(); + if ( ! argMap->value(YCPString("cacert")).isNull() ) + { + tls.setOption( TlsOptions::CACERTFILE, argMap->value( YCPString("cacert"))->asString()->value_cstr() ); + } if ( argMap->value(YCPString("starttls"))->asBoolean()->value() ) { m_lc->start_tls(); Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp Mon Jul 18 15:31:49 2011 @@ -800,7 +800,17 @@ ) ), `VSpacing(0.3), - `Password( `id( `te_config_cred ), `opt(`hstretch), _("Administration Password for the \"cn=config\" Database"), "" ) + `Password( `id( `te_config_cred ), `opt(`hstretch), _("Administration Password for the \"cn=config\" Database"), "" ), + `VSpacing(0.3), + `VSquash( + `HBox( + `InputField( `id( `te_ca_file ), `opt( `hstretch ), _("C&A Certificate File (PEM Format)") ), + `HSpacing( 0.5 ), + `Bottom( + `PushButton( `id( `pb_ca_file ), _("Bro&wse...") ) + ) + ) + ) ) ); @@ -810,9 +820,12 @@ Label::BackButton(), Label::NextButton() ); any ret = nil; + string cacert = "/etc/ssl/certs/YaST-CA.pem"; + while ( true ) { UI::ChangeWidget(`cb_start_tls, `Enabled, false ); + UI::ChangeWidget(`te_ca_file, `Value, cacert ); map synbase = LdapServer::ReadSyncreplBaseConfig(); if ( size(synbase) > 0 ) { @@ -830,8 +843,23 @@ ret = UI::UserInput(); } y2milestone( "SlaveSetupDialog: seeing return value '%1'", ret ); - if ( ret == `next ) + if( ret == `pb_ca_file ) + { + string name = UI::AskForExistingFile( "/etc/ssl/certs", "*.pem *.crt *", _("Select CA Certificate File") ); + if( name != nil ) + { + cacert = name; + } + continue; + } + else if ( ret == `next ) { + if ( cacert == "" || cacert == nil ) + { + Popup::Error( _("Please select a valid CA Certificate File") ); + continue; + } + // test connection map<string,any> provider = $[ "protocol" : (string)UI::QueryWidget( `cb_sync_prot, `Value ), @@ -852,6 +880,11 @@ testparm = add(testparm, "basedn", "cn=config" ); testparm = add(testparm, "binddn", "cn=config" ); testparm = add(testparm, "credentials", (string)UI::QueryWidget(`te_config_cred, `Value) ); + if ( cacert != "" && cacert != nil ) + { + testparm = add( testparm, "cacert", cacert ); + } + if (! LdapServer::ReadModeInstProposal() ) // Doing these checks during installation will // most probably fail { -- 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] r64874 - /branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapServer.pm
by rhafer＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: rhafer Date: Mon Jul 18 15:31:46 2011 New Revision: 64874 URL: http://svn.opensuse.org/viewcvs/yast?rev=64874&view=rev Log: fixed typo Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapServer.pm Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapServer.pm (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapServer.pm Mon Jul 18 15:31:46 2011 @@ -3396,7 +3396,7 @@ if ( $rc->{'exit'} != 0 ) { $self->SetError( _("Error while trying to verify the Server Certificate of the Provider server.\n"). - _("Please make sure that \"".$tls->{"caCertFile"}."\" constains the correct\nCA file to verify the remote Server Certificate."), + _("Please make sure that \"".$tls->{"caCertFile"}."\" contains the correct\nCA file to verify the remote Server Certificate."), $rc->{'stderr'} ); return 0; } -- 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] r64873 - /tags/stable-2_21_3/wagon/
by lslezak＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: lslezak Date: Mon Jul 18 15:26:13 2011 New Revision: 64873 URL: http://svn.opensuse.org/viewcvs/yast?rev=64873&view=rev Log: Created tag stable-2_21_3 for wagon Added: tags/stable-2_21_3/wagon/ (props changed) - copied from r64872, trunk/wagon/ -- 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] r64872 - in /trunk/wagon: VERSION package/yast2-wagon.changes src/clients/wagon_dup_repositories.ycp src/clients/wagon_registration_handler.ycp src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: lslezak Date: Mon Jul 18 15:25:42 2011 New Revision: 64872 URL: http://svn.opensuse.org/viewcvs/yast?rev=64872&view=rev Log: - added new core/full migration selection dialog - 2.21.3 Modified: trunk/wagon/VERSION trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon_dup_repositories.ycp trunk/wagon/src/clients/wagon_registration_handler.ycp trunk/wagon/src/modules/Wagon.ycp Modified: trunk/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/VERSION?rev=64872&r1=64871… ============================================================================== --- trunk/wagon/VERSION (original) +++ trunk/wagon/VERSION Mon Jul 18 15:25:42 2011 @@ -1 +1 @@ -2.21.2 +2.21.3 Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Mon Jul 18 15:25:42 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 18 12:48:20 UTC 2011 - lslezak(a)suse.cz + +- added new core/full migration selection dialog +- 2.21.3 + +------------------------------------------------------------------- Mon Jul 4 11:28:46 UTC 2011 - lslezak(a)suse.cz - if the system is managed by SUSE Manager display a message Modified: trunk/wagon/src/clients/wagon_dup_repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_dup_repo… ============================================================================== --- trunk/wagon/src/clients/wagon_dup_repositories.ycp (original) +++ trunk/wagon/src/clients/wagon_dup_repositories.ycp Mon Jul 18 15:25:42 2011 @@ -150,8 +150,138 @@ return ret; } + void SetMigrationSelectionDialogContent() + { + // heading text + string heading_text = _("Migration Type"); - symbol ret = DupSelectionDialog(); + term contents = `VBox( + // frame label + `Frame(_("Migration type"), + `HSquash( + `MarginBox(2, 0.5, + `RadioButtonGroup(`id(`migration_type), + `VBox( + // radio button + `Left(`RadioButton(`id(`minimal), _("&Minimal migration (only the core packages)"), true)), + // radio button + `Left(`RadioButton(`id(`full), _("&Full migration (all packages)"))) + ) + ) + ) + ) + ), + + `VSpacing(2), + + // push button + `PushButton(`id(`advanced), _("Advanced...")) + ); + + // help text + string help_text = "" + _("Select the requested migration type.") + // help text + + "" + _("Minimal migration migrates only minimal set of packages (the core packages providing basic system functionality), full migration migrates all installed packages.") + ""; + + Wizard::SetContents (heading_text, contents, help_text, + GetInstArgs::enable_back(), GetInstArgs::enable_next()); + } + + symbol MigrationSelectionDialog() + { + SetMigrationSelectionDialogContent(); + + symbol ret = nil; + + while (true) { + ret = (symbol)UI::UserInput(); + + if (ret == `next) + { + // set the update repositories + symbol mtype = (symbol) UI::QueryWidget(`id(`migration_type), `CurrentButton); + y2milestone("Selected migration type: %1", mtype); + + if (mtype == `full) + { + // DUP: all repositories + y2milestone("Selected full migration, using %1 repositories", size(Pkg::SourceGetCurrent(true))); + Wagon::SetDupRepos(Pkg::SourceGetCurrent(true)); + } + else if (mtype == `minimal) + { + // DUP: only added repositories + y2milestone("Selected minimal migration, using these repositories: %1", Wagon::RegistrationRepos()); + + map<string, integer> alias_to_id = $[]; + foreach(integer repo, Pkg::SourceGetCurrent(true), + { + alias_to_id[Pkg::SourceGeneralData(repo)["alias"]:""] = repo; + } + ); + + list<integer> added_repos = maplist(string alias, Wagon::RegistrationRepos(), + { + return alias_to_id[alias]:-1; + } + ); + + y2milestone("Converted aliases to ids: %1", added_repos); + + Wagon::SetDupRepos(added_repos); + } + else + { + // error popup message + Popup::Error(sformat(_("Selected unknown migration type: %1"), mtype)); + y2error("Unknown migratinon type: %1", mtype); + + continue; + } + + break; + } + else if (ret == `back) + { + break; + } + else if (ret == `abort || ret == `close) + { + break; + } + else if (ret == `advanced) + { + // manually select DUP repositories + y2milestone("Manual DUP repository selection selected"); + ret = DupSelectionDialog(); + + if (ret == `abort || ret == `close || ret == `next) + { + break; + } + else if (ret == `back) + { + // refresh the dialog + SetMigrationSelectionDialogContent(); + } + else + { + y2error("Unexpected user input: %1", ret); + } + } + else + { + y2error("Unexpected user input: %1", ret); + } + } + + return ret; + } + + // for custom migration repo we cannot select full/core migration type, + // and also when there is no new registration repo we cannot detect full/core migrations + // => go directly to the repository selection (advanced option) + symbol ret = (Wagon::GetMigrationMethod() == "suse_register" && size(Wagon::RegistrationRepos()) > 0) ? MigrationSelectionDialog() : DupSelectionDialog(); y2milestone ("Result: %1", ret); Modified: trunk/wagon/src/clients/wagon_registration_handler.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_registra… ============================================================================== --- trunk/wagon/src/clients/wagon_registration_handler.ycp (original) +++ trunk/wagon/src/clients/wagon_registration_handler.ycp Mon Jul 18 15:25:42 2011 @@ -57,6 +57,16 @@ return sort (ret); } + list<string> AddedRepos(list<string> prev, list<string> curr) + { + list<string> ret = []; + + // added repos = all current which were not in the previous state + ret = filter(string curr_repo, curr, {return !contains(prev, curr_repo);}); + + return ret; + } + // all repository aliases list <string> all_repos = GetCurrentlyEnabledReposByAlias(); y2milestone ("Currently registered repositories: %1", all_repos); @@ -91,7 +101,13 @@ list <string> current_repos = GetCurrentlyEnabledReposByAlias(); if (all_repos != current_repos) { Wagon::repos_already_registered = true; + + // remember the added repositories + list<string> added = AddedRepos(all_repos, current_repos); + Wagon::SetRegistrationRepos(added); + y2milestone ("List of repositories has changed: %1", current_repos); + y2milestone("Added repositories: %1", added); break; } Modified: trunk/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/modules/Wagon.ycp (original) +++ trunk/wagon/src/modules/Wagon.ycp Mon Jul 18 15:25:42 2011 @@ -123,6 +123,21 @@ dup_repos = repos; } + // list of repositories (aliases) added by suse_register + list<string> new_registration_repos = []; + + // returns list of repositories (aliases) added by suse_register + global list<string> RegistrationRepos() + { + return new_registration_repos; + } + + // set list of repositories (aliases) added by suse_register + global void SetRegistrationRepos(list<string> repos) + { + y2milestone("Repositories added by registration: %1", new_registration_repos); + new_registration_repos = repos; + } void ResetWorkflowSteps () { ProductControl::UnDisableAllModulesAndProposals (Mode::mode(), Stage::stage()); -- 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] r64871 - /tags/branch-Code-11-SP2-2_17_23/wagon/
by lslezak＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: lslezak Date: Mon Jul 18 15:04:34 2011 New Revision: 64871 URL: http://svn.opensuse.org/viewcvs/yast?rev=64871&view=rev Log: Created tag branch-Code-11-SP2-2_17_23 for wagon Added: tags/branch-Code-11-SP2-2_17_23/wagon/ (props changed) - copied from r64870, branches/SuSE-Code-11-SP2-Branch/wagon/ -- 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] r64870 - /trunk/s390/src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: aschnell Date: Mon Jul 18 15:04:08 2011 New Revision: 64870 URL: http://svn.opensuse.org/viewcvs/yast?rev=64870&view=rev Log: - fixed diag mode detection Modified: trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Mon Jul 18 15:04:08 2011 @@ -324,13 +324,14 @@ d["formatted"] = formatted; d["partition_info"] = GetPartitionInfo (device); } - string diag_file = sformat("/sys/%1/use_diag", d["sysfs_id"]:""); - if (FileUtils::Exists(diag_file)){ - string use_diag = (string)SCR::Read(.target.string, diag_file); -// y2milestone("use_diag %1", use_diag); - if (substring(use_diag,0,1) == "1") diag[channel]=true; - else diag[channel]=false; + + string diag_file = sformat("/sys/%1/device/use_diag", d["sysfs_id"]:""); + if (FileUtils::Exists(diag_file)) + { + string use_diag = (string)SCR::Read(.target.string, diag_file); + diag[channel] = substring(use_diag, 0, 1) == "1"; } + return d; }); integer index = -1; -- 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] r64869 - in /branches/SuSE-Code-11-SP2-Branch/wagon: VERSION package/yast2-wagon.changes src/clients/wagon_dup_repositories.ycp src/clients/wagon_registration_handler.ycp src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: lslezak Date: Mon Jul 18 15:03:25 2011 New Revision: 64869 URL: http://svn.opensuse.org/viewcvs/yast?rev=64869&view=rev Log: - added new core/full migration selection dialog - 2.17.23 Modified: branches/SuSE-Code-11-SP2-Branch/wagon/VERSION branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_registration_handler.ycp branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/VERSION Mon Jul 18 15:03:25 2011 @@ -1 +1 @@ -2.17.22 +2.17.23 Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Mon Jul 18 15:03:25 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 18 12:48:20 UTC 2011 - lslezak(a)suse.cz + +- added new core/full migration selection dialog +- 2.17.23 + +------------------------------------------------------------------- Mon Jul 4 11:28:46 UTC 2011 - lslezak(a)suse.cz - if the system is managed by SUSE Manager display a message Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp Mon Jul 18 15:03:25 2011 @@ -150,8 +150,138 @@ return ret; } + void SetMigrationSelectionDialogContent() + { + // heading text + string heading_text = _("Migration Type"); - symbol ret = DupSelectionDialog(); + term contents = `VBox( + // frame label + `Frame(_("Migration type"), + `HSquash( + `MarginBox(2, 0.5, + `RadioButtonGroup(`id(`migration_type), + `VBox( + // radio button + `Left(`RadioButton(`id(`minimal), _("&Minimal migration (only the core packages)"), true)), + // radio button + `Left(`RadioButton(`id(`full), _("&Full migration (all packages)"))) + ) + ) + ) + ) + ), + + `VSpacing(2), + + // push button + `PushButton(`id(`advanced), _("Advanced...")) + ); + + // help text + string help_text = "" + _("Select the requested migration type.") + // help text + + "" + _("Minimal migration migrates only minimal set of packages (the core packages providing basic system functionality), full migration migrates all installed packages.") + ""; + + Wizard::SetContents (heading_text, contents, help_text, + GetInstArgs::enable_back(), GetInstArgs::enable_next()); + } + + symbol MigrationSelectionDialog() + { + SetMigrationSelectionDialogContent(); + + symbol ret = nil; + + while (true) { + ret = (symbol)UI::UserInput(); + + if (ret == `next) + { + // set the update repositories + symbol mtype = (symbol) UI::QueryWidget(`id(`migration_type), `CurrentButton); + y2milestone("Selected migration type: %1", mtype); + + if (mtype == `full) + { + // DUP: all repositories + y2milestone("Selected full migration, using %1 repositories", size(Pkg::SourceGetCurrent(true))); + Wagon::SetDupRepos(Pkg::SourceGetCurrent(true)); + } + else if (mtype == `minimal) + { + // DUP: only added repositories + y2milestone("Selected minimal migration, using these repositories: %1", Wagon::RegistrationRepos()); + + map<string, integer> alias_to_id = $[]; + foreach(integer repo, Pkg::SourceGetCurrent(true), + { + alias_to_id[Pkg::SourceGeneralData(repo)["alias"]:""] = repo; + } + ); + + list<integer> added_repos = maplist(string alias, Wagon::RegistrationRepos(), + { + return alias_to_id[alias]:-1; + } + ); + + y2milestone("Converted aliases to ids: %1", added_repos); + + Wagon::SetDupRepos(added_repos); + } + else + { + // error popup message + Popup::Error(sformat(_("Selected unknown migration type: %1"), mtype)); + y2error("Unknown migratinon type: %1", mtype); + + continue; + } + + break; + } + else if (ret == `back) + { + break; + } + else if (ret == `abort || ret == `close) + { + break; + } + else if (ret == `advanced) + { + // manually select DUP repositories + y2milestone("Manual DUP repository selection selected"); + ret = DupSelectionDialog(); + + if (ret == `abort || ret == `close || ret == `next) + { + break; + } + else if (ret == `back) + { + // refresh the dialog + SetMigrationSelectionDialogContent(); + } + else + { + y2error("Unexpected user input: %1", ret); + } + } + else + { + y2error("Unexpected user input: %1", ret); + } + } + + return ret; + } + + // for custom migration repo we cannot select full/core migration type, + // and also when there is no new registration repo we cannot detect full/core migrations + // => go directly to the repository selection (advanced option) + symbol ret = (Wagon::GetMigrationMethod() == "suse_register" && size(Wagon::RegistrationRepos()) > 0) ? MigrationSelectionDialog() : DupSelectionDialog(); y2milestone ("Result: %1", ret); Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_registration_handler.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_registration_handler.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_registration_handler.ycp Mon Jul 18 15:03:25 2011 @@ -57,6 +57,16 @@ return sort (ret); } + list<string> AddedRepos(list<string> prev, list<string> curr) + { + list<string> ret = []; + + // added repos = all current which were not in the previous state + ret = filter(string curr_repo, curr, {return !contains(prev, curr_repo);}); + + return ret; + } + // all repository aliases list <string> all_repos = GetCurrentlyEnabledReposByAlias(); y2milestone ("Currently registered repositories: %1", all_repos); @@ -91,7 +101,13 @@ list <string> current_repos = GetCurrentlyEnabledReposByAlias(); if (all_repos != current_repos) { Wagon::repos_already_registered = true; + + // remember the added repositories + list<string> added = AddedRepos(all_repos, current_repos); + Wagon::SetRegistrationRepos(added); + y2milestone ("List of repositories has changed: %1", current_repos); + y2milestone("Added repositories: %1", added); break; } Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Mon Jul 18 15:03:25 2011 @@ -123,6 +123,21 @@ dup_repos = repos; } + // list of repositories (aliases) added by suse_register + list<string> new_registration_repos = []; + + // returns list of repositories (aliases) added by suse_register + global list<string> RegistrationRepos() + { + return new_registration_repos; + } + + // set list of repositories (aliases) added by suse_register + global void SetRegistrationRepos(list<string> repos) + { + y2milestone("Repositories added by registration: %1", new_registration_repos); + new_registration_repos = repos; + } void ResetWorkflowSteps () { ProductControl::UnDisableAllModulesAndProposals (Mode::mode(), Stage::stage()); -- 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] r64868 - /branches/SuSE-Code-11-SP2-Branch/s390/src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: aschnell Date: Mon Jul 18 15:01:10 2011 New Revision: 64868 URL: http://svn.opensuse.org/viewcvs/yast?rev=64868&view=rev Log: - fixed diag mode detection Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/modules/DASDController.ycp Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/modules/DASDController.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/modules/DASDController.ycp Mon Jul 18 15:01:10 2011 @@ -332,12 +332,11 @@ d["partition_info"] = "--"; } } - string diag_file = sformat("/sys/%1/use_diag", d["sysfs_id"]:""); + + string diag_file = sformat("/sys/%1/device/use_diag", d["sysfs_id"]:""); if (FileUtils::Exists(diag_file)){ string use_diag = (string)SCR::Read(.target.string, diag_file); -// y2milestone("use_diag %1", use_diag); - if (substring(use_diag,0,1) == "1") diag[channel]=true; - else diag[channel]=false; + diag[channel] = substring(use_diag, 0, 1) == "1"; } return d; }); -- 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] r64867 - in /branches/SuSE-Code-11-SP2-Branch/s390: VERSION package/yast2-s390.changes src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: aschnell Date: Mon Jul 18 10:31:48 2011 New Revision: 64867 URL: http://svn.opensuse.org/viewcvs/yast?rev=64867&view=rev Log: - include fix for bnc #591603 Modified: branches/SuSE-Code-11-SP2-Branch/s390/VERSION branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes branches/SuSE-Code-11-SP2-Branch/s390/src/modules/DASDController.ycp Modified: branches/SuSE-Code-11-SP2-Branch/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/VERSION Mon Jul 18 10:31:48 2011 @@ -1 +1 @@ -2.17.17 +2.17.18 Modified: branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes Mon Jul 18 10:31:48 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 18 10:30:40 CEST 2011 - aschnell(a)suse.de + +- include fix for bnc #591603 +- 2.17.18 + +------------------------------------------------------------------- Fri May 13 03:36:54 EDT 2011 - aschnell(a)suse.de - allow to configure zFCP tapes (fate #311718) Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/modules/DASDController.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/modules/DASDController.ycp Mon Jul 18 10:31:48 2011 @@ -197,6 +197,9 @@ if (Mode::config ()) { list l = maplist (integer i, map<string,any> d, devices, { + // if possible, use device by-path (bnc#591603) + if (haskey(d, "dev_name") && size(d["dev_names"]:[]) > 1) + d["dev_name"] = d["dev_names", 1]:""; return d; }); -- 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] r64866 - /tags/branch-Code-11-SP2-2_17_6/ftp-server/
by jsrain＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: jsrain Date: Mon Jul 18 09:02:29 2011 New Revision: 64866 URL: http://svn.opensuse.org/viewcvs/yast?rev=64866&view=rev Log: Created tag branch-Code-11-SP2-2_17_6 for ftp-server Added: tags/branch-Code-11-SP2-2_17_6/ftp-server/ (props changed) - copied from r64865, branches/SuSE-Code-11-SP2-Branch/ftp-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] r64865 - /tags/branch-Code-11-SP2-2_17_6/
by jsrain＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: jsrain Date: Mon Jul 18 09:02:26 2011 New Revision: 64865 URL: http://svn.opensuse.org/viewcvs/yast?rev=64865&view=rev Log: Created tag branch-Code-11-SP2-2_17_6 Added: tags/branch-Code-11-SP2-2_17_6/ -- 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] r64864 - in /branches/SuSE-Code-11-SP2-Branch/ftp-server: VERSION package/yast2-ftp-server.changes
by jsrain＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: jsrain Date: Mon Jul 18 08:59:07 2011 New Revision: 64864 URL: http://svn.opensuse.org/viewcvs/yast?rev=64864&view=rev Log: bump Modified: branches/SuSE-Code-11-SP2-Branch/ftp-server/VERSION branches/SuSE-Code-11-SP2-Branch/ftp-server/package/yast2-ftp-server.changes Modified: branches/SuSE-Code-11-SP2-Branch/ftp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ftp-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ftp-server/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/ftp-server/VERSION Mon Jul 18 08:59:07 2011 @@ -1 +1 @@ -2.17.5 +2.17.6 Modified: branches/SuSE-Code-11-SP2-Branch/ftp-server/package/yast2-ftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ftp-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ftp-server/package/yast2-ftp-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/ftp-server/package/yast2-ftp-server.changes Mon Jul 18 08:59:07 2011 @@ -3,6 +3,7 @@ - fixed command line interface - not polling UI while reading the settings (bnc#660821) +- 2.17.6 ------------------------------------------------------------------ Mon Nov 30 10:26:55 CET 2009 - juhliarik(a)suse.cz -- 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] r64863 - /branches/SuSE-Code-11-SP2-Branch/ftp-server/
by jsrain＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: jsrain Date: Mon Jul 18 08:47:48 2011 New Revision: 64863 URL: http://svn.opensuse.org/viewcvs/yast?rev=64863&view=rev Log: branched for SP2 Added: branches/SuSE-Code-11-SP2-Branch/ftp-server/ (props changed) - copied from r64862, branches/SuSE-Code-11-SP1-Branch/ftp-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] r64862 - in /trunk/autoinstallation: package/autoyast2.changes src/include/conftree.ycp
by jsrain＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: jsrain Date: Mon Jul 18 08:37:03 2011 New Revision: 64862 URL: http://svn.opensuse.org/viewcvs/yast?rev=64862&view=rev Log: - fixed typo (bnc#702662) Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/include/conftree.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Mon Jul 18 08:37:03 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jul 18 08:36:53 CEST 2011 - jsrain(a)suse.cz + +- fixed typo (bnc#702662) + +------------------------------------------------------------------- Thu Jul 14 13:19:40 CEST 2011 - ug(a)suse.de - New profile flag networking/setup_before_proposal enables setting Modified: trunk/autoinstallation/src/include/conftree.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/con… ============================================================================== --- trunk/autoinstallation/src/include/conftree.ycp (original) +++ trunk/autoinstallation/src/include/conftree.ycp Mon Jul 18 08:37:03 2011 @@ -43,7 +43,7 @@ } else { - Popup::Warning(_("An error occured while saving the file.")); + Popup::Warning(_("An error occurred while saving the file.")); } } return `next; @@ -564,7 +564,7 @@ menus(); } else { /* opening/parsing the xml file failed */ - Popup::Error(_("An error occured while opening/parsing the XML file.")); + Popup::Error(_("An error occurred while opening/parsing the XML file.")); Profile::Reset(); } @@ -633,7 +633,7 @@ } else { - Popup::Warning(_("An error occured while saving the file.")); + Popup::Warning(_("An error occurred while saving the file.")); } ret = `menu_save; } -- 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] r64861 - in /trunk/yast2: library/control/src/WorkflowManager.ycp package/yast2.changes
by jsrain＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: jsrain Date: Mon Jul 18 08:36:34 2011 New Revision: 64861 URL: http://svn.opensuse.org/viewcvs/yast?rev=64861&view=rev Log: - fixed typo (bnc#702662) Modified: trunk/yast2/library/control/src/WorkflowManager.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/control/src/WorkflowManager.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/control/src/Workfl… ============================================================================== --- trunk/yast2/library/control/src/WorkflowManager.ycp (original) +++ trunk/yast2/library/control/src/WorkflowManager.ycp Mon Jul 18 08:36:34 2011 @@ -1200,7 +1200,7 @@ if (! IntegrateWorkflow (one_workflow)) { y2error ("Merging '%1' failed!", one_workflow); - Report::Error (_("An internal error occured when integrating additional workflow.")); + Report::Error (_("An internal error occurred when integrating additional workflow.")); ret = false; } }); Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon Jul 18 08:36:34 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jul 18 08:26:12 CEST 2011 - jsrain(a)suse.cz + +- fixed typo (bnc#702662) + +------------------------------------------------------------------- Tue Jun 28 13:50:16 UTC 2011 - lslezak(a)suse.cz - Suppress decimal zeroes for kB sizes (e.g. display "743 kB" -- 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] r64860 - /trunk/mail/src/suse-mailserver.schema
by varkoly＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: varkoly Date: Mon Jul 18 07:07:24 2011 New Revision: 64860 URL: http://svn.opensuse.org/viewcvs/yast?rev=64860&view=rev Log: Fix: set boolean attributes to SINGLE-VALUE Modified: trunk/mail/src/suse-mailserver.schema Modified: trunk/mail/src/suse-mailserver.schema URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/suse-mailserver.schema?… ============================================================================== --- trunk/mail/src/suse-mailserver.schema (original) +++ trunk/mail/src/suse-mailserver.schema Mon Jul 18 07:07:24 2011 @@ -114,38 +114,40 @@ DESC 'Shows if the member of the group the mails will get' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{16} ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{16} + SINGLE-VALUE ) + +attributetype ( MailAT:18 NAME ( 'suseDeliveryToFolder' 'deliveryToFolder' ) + DESC 'Shows if the member of the group the mails will get' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{16} + SINGLE-VALUE ) -attributetype ( MailAT:18 NAME ( 'suseImapQuota' 'imapQuota') +attributetype ( MailAT:19 NAME ( 'suseImapQuota' 'imapQuota') DESC 'Shows the imap quota of a user.' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attributetype ( MailAT:19 NAME ( 'tableKey') +attributetype ( MailAT:20 NAME ( 'tableKey') DESC 'Shows the imap quota of a user.' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} SINGLE-VALUE ) -attributetype ( MailAT:20 NAME ( 'tableValue') +attributetype ( MailAT:21 NAME ( 'tableValue') DESC 'Shows the imap quota of a user.' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} SINGLE-VALUE ) -attributetype ( MailAT:21 NAME ( 'valueType') +attributetype ( MailAT:22 NAME ( 'valueType') DESC 'Shows the imap quota of a user.' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{16} SINGLE-VALUE ) -attributetype ( MailAT:22 NAME ( 'suseDeliveryToFolder' 'deliveryToFolder' ) - DESC 'Shows if the member of the group the mails will get' - EQUALITY caseIgnoreMatch - SUBSTR caseIgnoreSubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{16} ) - ## ## Objectclass Section ## @@ -153,7 +155,8 @@ DESC 'represents an entry which is able to receive mail' MAY ( suseMailAcceptAddress $ suseMailAlias $ suseVirtualAddress $ suseMailCommand $ - suseMailForwardAddress $ suseDeliveryToMember $ suseImapQuota $ suseDeliveryToFolder ) ) + suseMailForwardAddress $ suseDeliveryToMember $ + suseDeliveryToFolder $ suseImapQuota ) ) objectclass ( MailOC:2 NAME ( 'suseMailDomain' 'mailDomain' ) SUP top AUXILIARY DESC 'To configure behaviour of mail domains' -- 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] r64859 - /branches/SuSE-Code-11-SP1-Branch/mail/src/suse-mailserver.schema
by varkoly＠svn2.opensuse.org 18 Jul '11

18 Jul '11

Author: varkoly Date: Mon Jul 18 07:07:08 2011 New Revision: 64859 URL: http://svn.opensuse.org/viewcvs/yast?rev=64859&view=rev Log: Fix: set boolean attributes to SINGLE-VALUE Modified: branches/SuSE-Code-11-SP1-Branch/mail/src/suse-mailserver.schema Modified: branches/SuSE-Code-11-SP1-Branch/mail/src/suse-mailserver.schema URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/mail/src/suse-mailserver.schema (original) +++ branches/SuSE-Code-11-SP1-Branch/mail/src/suse-mailserver.schema Mon Jul 18 07:07:08 2011 @@ -114,38 +114,40 @@ DESC 'Shows if the member of the group the mails will get' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{16} ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{16} + SINGLE-VALUE ) + +attributetype ( MailAT:18 NAME ( 'suseDeliveryToFolder' 'deliveryToFolder' ) + DESC 'Shows if the member of the group the mails will get' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{16} + SINGLE-VALUE ) -attributetype ( MailAT:18 NAME ( 'suseImapQuota' 'imapQuota') +attributetype ( MailAT:19 NAME ( 'suseImapQuota' 'imapQuota') DESC 'Shows the imap quota of a user.' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -attributetype ( MailAT:19 NAME ( 'tableKey') +attributetype ( MailAT:20 NAME ( 'tableKey') DESC 'Shows the imap quota of a user.' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} SINGLE-VALUE ) -attributetype ( MailAT:20 NAME ( 'tableValue') +attributetype ( MailAT:21 NAME ( 'tableValue') DESC 'Shows the imap quota of a user.' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} SINGLE-VALUE ) -attributetype ( MailAT:21 NAME ( 'valueType') +attributetype ( MailAT:22 NAME ( 'valueType') DESC 'Shows the imap quota of a user.' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{16} SINGLE-VALUE ) -attributetype ( MailAT:22 NAME ( 'suseDeliveryToFolder' 'deliveryToFolder' ) - DESC 'Shows if the member of the group the mails will get' - EQUALITY caseIgnoreMatch - SUBSTR caseIgnoreSubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{16} ) - ## ## Objectclass Section ## @@ -153,7 +155,8 @@ DESC 'represents an entry which is able to receive mail' MAY ( suseMailAcceptAddress $ suseMailAlias $ suseVirtualAddress $ suseMailCommand $ - suseMailForwardAddress $ suseDeliveryToMember $ suseImapQuota $ suseDeliveryToFolder ) ) + suseMailForwardAddress $ suseDeliveryToMember $ + suseDeliveryToFolder $ suseImapQuota ) ) objectclass ( MailOC:2 NAME ( 'suseMailDomain' 'mailDomain' ) SUP top AUXILIARY DESC 'To configure behaviour of mail domains' -- 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] r64858 - /tags/branch-Code-11-SP2-2_17_47/users/
by jsuchome＠svn2.opensuse.org 15 Jul '11

15 Jul '11

Author: jsuchome Date: Fri Jul 15 12:48:51 2011 New Revision: 64858 URL: http://svn.opensuse.org/viewcvs/yast?rev=64858&view=rev Log: Created tag branch-Code-11-SP2-2_17_47 for users Added: tags/branch-Code-11-SP2-2_17_47/users/ (props changed) - copied from r64857, branches/SuSE-Code-11-SP2-Branch/users/ -- 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] r64857 - /tags/branch-Code-11-SP2-2_17_47/
by jsuchome＠svn2.opensuse.org 15 Jul '11

15 Jul '11

Author: jsuchome Date: Fri Jul 15 12:48:47 2011 New Revision: 64857 URL: http://svn.opensuse.org/viewcvs/yast?rev=64857&view=rev Log: Created tag branch-Code-11-SP2-2_17_47 Added: tags/branch-Code-11-SP2-2_17_47/ -- 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] r64856 - /tags/stable-2_21_5/users/
by jsuchome＠svn2.opensuse.org 15 Jul '11

15 Jul '11

Author: jsuchome Date: Fri Jul 15 12:48:43 2011 New Revision: 64856 URL: http://svn.opensuse.org/viewcvs/yast?rev=64856&view=rev Log: Created tag stable-2_21_5 for users Added: tags/stable-2_21_5/users/ - copied from r64855, trunk/users/ -- 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] r64855 - in /branches/SuSE-Code-11-SP2-Branch/users: VERSION package/yast2-users.changes src/UsersSimple.pm src/widgets.ycp testsuite/tests/CheckPassword.out
by jsuchome＠svn2.opensuse.org 15 Jul '11

15 Jul '11

Author: jsuchome Date: Fri Jul 15 12:48:28 2011 New Revision: 64855 URL: http://svn.opensuse.org/viewcvs/yast?rev=64855&view=rev Log: - fixed typos (bnc#703227) - adapted testsuite - 2.17.47 Modified: branches/SuSE-Code-11-SP2-Branch/users/VERSION branches/SuSE-Code-11-SP2-Branch/users/package/yast2-users.changes branches/SuSE-Code-11-SP2-Branch/users/src/UsersSimple.pm branches/SuSE-Code-11-SP2-Branch/users/src/widgets.ycp branches/SuSE-Code-11-SP2-Branch/users/testsuite/tests/CheckPassword.out Modified: branches/SuSE-Code-11-SP2-Branch/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/users… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/users/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/users/VERSION Fri Jul 15 12:48:28 2011 @@ -1 +1 @@ -2.17.46 +2.17.47 Modified: branches/SuSE-Code-11-SP2-Branch/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/users… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/users/package/yast2-users.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/users/package/yast2-users.changes Fri Jul 15 12:48:28 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jul 15 12:40:56 CEST 2011 - jsuchome(a)suse.cz + +- fixed typos (bnc#703227) +- adapted testsuite +- 2.17.47 + +------------------------------------------------------------------- Mon Apr 18 15:58:27 CEST 2011 - jsuchome(a)suse.cz - UMASK setting moved to /etc/default/useradd, /etc/login.defs Modified: branches/SuSE-Code-11-SP2-Branch/users/src/UsersSimple.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/users… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/users/src/UsersSimple.pm (original) +++ branches/SuSE-Code-11-SP2-Branch/users/src/UsersSimple.pm Fri Jul 15 12:48:28 2011 @@ -641,7 +641,7 @@ $filtered = reverse $pw; if ($filtered eq $pw) { # popup question - return __("You have used a palindrom for the password."); + return __("You have used a palindrome for the password."); } # check for numbers Modified: branches/SuSE-Code-11-SP2-Branch/users/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/users… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/users/src/widgets.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/users/src/widgets.ycp Fri Jul 15 12:48:28 2011 @@ -244,7 +244,7 @@ You have changed the default encryption for user passwords.") + // help text 2/3 - _("It seems that you are running a NIS server. In some network enviroments, + _("It seems that you are running a NIS server. In some network environments, you could be unable to log in to a NIS client when a user password is encrypted with a method other than DES. Modified: branches/SuSE-Code-11-SP2-Branch/users/testsuite/tests/CheckPassword.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/users… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/users/testsuite/tests/CheckPassword.out (original) +++ branches/SuSE-Code-11-SP2-Branch/users/testsuite/tests/CheckPassword.out Fri Jul 15 12:48:28 2011 @@ -7,7 +7,7 @@ Execute .crack "12345" "" Return ["You have used only digits for the password."] Execute .crack "aaaQQaaa" "" -Return ["You have used a palindrom for the password."] +Return ["You have used a palindrome for the password."] Execute .crack "1a" "" Return ["The password should have at least 5 characters."] Return nil -- 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] r64854 - in /trunk/users: VERSION package/yast2-users.changes testsuite/tests/CheckPassword.out
by jsuchome＠svn2.opensuse.org 15 Jul '11

15 Jul '11

Author: jsuchome Date: Fri Jul 15 12:48:18 2011 New Revision: 64854 URL: http://svn.opensuse.org/viewcvs/yast?rev=64854&view=rev Log: - adapted testsuite to previous change - 2.21.5 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/testsuite/tests/CheckPassword.out Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=64854&r1=64853… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Fri Jul 15 12:48:18 2011 @@ -1 +1 @@ -2.21.4 +2.21.5 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Fri Jul 15 12:48:18 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 15 12:45:19 CEST 2011 - jsuchome(a)suse.cz + +- adapted testsuite to previous change +- 2.21.5 + +------------------------------------------------------------------- Fri Jul 15 12:41:25 CEST 2011 - jsuchome(a)suse.cz - fixed typos (bnc#703227) Modified: trunk/users/testsuite/tests/CheckPassword.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/CheckPassw… ============================================================================== --- trunk/users/testsuite/tests/CheckPassword.out (original) +++ trunk/users/testsuite/tests/CheckPassword.out Fri Jul 15 12:48:18 2011 @@ -7,7 +7,7 @@ Execute .crack "12345" "" Return ["You have used only digits for the password."] Execute .crack "aaaQQaaa" "" -Return ["You have used a palindrom for the password."] +Return ["You have used a palindrome for the password."] Execute .crack "1a" "" Return ["The password should have at least 5 characters."] Return nil -- 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] r64853 - /tags/stable-2_21_4/users/
by jsuchome＠svn2.opensuse.org 15 Jul '11

15 Jul '11

Author: jsuchome Date: Fri Jul 15 12:43:40 2011 New Revision: 64853 URL: http://svn.opensuse.org/viewcvs/yast?rev=64853&view=rev Log: Created tag stable-2_21_4 for users Added: tags/stable-2_21_4/users/ - copied from r64852, trunk/users/ -- 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] r64852 - in /trunk/users: VERSION package/yast2-users.changes src/UsersSimple.pm src/widgets.ycp
by jsuchome＠svn2.opensuse.org 15 Jul '11

15 Jul '11

Author: jsuchome Date: Fri Jul 15 12:43:33 2011 New Revision: 64852 URL: http://svn.opensuse.org/viewcvs/yast?rev=64852&view=rev Log: - fixed typos (bnc#703227) - 2.21.4 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/UsersSimple.pm trunk/users/src/widgets.ycp Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=64852&r1=64851… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Fri Jul 15 12:43:33 2011 @@ -1 +1 @@ -2.21.3 +2.21.4 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Fri Jul 15 12:43:33 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 15 12:41:25 CEST 2011 - jsuchome(a)suse.cz + +- fixed typos (bnc#703227) +- 2.21.4 + +------------------------------------------------------------------- Tue Apr 5 11:01:12 CEST 2011 - jsuchome(a)suse.cz - added support for SHA-2 based crypto methods (fate309705) Modified: trunk/users/src/UsersSimple.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersSimple.pm?rev=648… ============================================================================== --- trunk/users/src/UsersSimple.pm (original) +++ trunk/users/src/UsersSimple.pm Fri Jul 15 12:43:33 2011 @@ -643,7 +643,7 @@ $filtered = reverse $pw; if ($filtered eq $pw) { # popup question - return __("You have used a palindrom for the password."); + return __("You have used a palindrome for the password."); } # check for numbers Modified: trunk/users/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/widgets.ycp?rev=64852&… ============================================================================== --- trunk/users/src/widgets.ycp (original) +++ trunk/users/src/widgets.ycp Fri Jul 15 12:43:33 2011 @@ -245,7 +245,7 @@ You have changed the default encryption for user passwords.") + // help text 2/3 - _("It seems that you are running a NIS server. In some network enviroments, + _("It seems that you are running a NIS server. In some network environments, you could be unable to log in to a NIS client when a user password is encrypted with a method other than DES. -- 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] r64851 - /tags/branch-Code-11-SP2-2_17_2/profile-manager/
by jsuchome＠svn2.opensuse.org 15 Jul '11

15 Jul '11

Author: jsuchome Date: Fri Jul 15 12:39:13 2011 New Revision: 64851 URL: http://svn.opensuse.org/viewcvs/yast?rev=64851&view=rev Log: Created tag branch-Code-11-SP2-2_17_2 for profile-manager Added: tags/branch-Code-11-SP2-2_17_2/profile-manager/ (props changed) - copied from r64850, branches/SuSE-Code-11-SP2-Branch/profile-manager/ -- 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] r64850 - in /branches/SuSE-Code-11-SP2-Branch/profile-manager: VERSION package/yast2-profile-manager.changes src/ProfileManager.ycp src/helps.ycp
by jsuchome＠svn2.opensuse.org 15 Jul '11

15 Jul '11

Author: jsuchome Date: Fri Jul 15 12:37:56 2011 New Revision: 64850 URL: http://svn.opensuse.org/viewcvs/yast?rev=64850&view=rev Log: - fixed typos (bnc#703203) - 2.17.2 Modified: branches/SuSE-Code-11-SP2-Branch/profile-manager/VERSION branches/SuSE-Code-11-SP2-Branch/profile-manager/package/yast2-profile-manager.changes branches/SuSE-Code-11-SP2-Branch/profile-manager/src/ProfileManager.ycp branches/SuSE-Code-11-SP2-Branch/profile-manager/src/helps.ycp Modified: branches/SuSE-Code-11-SP2-Branch/profile-manager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/profi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/profile-manager/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/profile-manager/VERSION Fri Jul 15 12:37:56 2011 @@ -1 +1 @@ -2.17.1 +2.17.2 Modified: branches/SuSE-Code-11-SP2-Branch/profile-manager/package/yast2-profile-manager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/profi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/profile-manager/package/yast2-profile-manager.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/profile-manager/package/yast2-profile-manager.changes Fri Jul 15 12:37:56 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 15 12:31:40 CEST 2011 - jsuchome(a)suse.cz + +- fixed typos (bnc#703203) +- 2.17.2 + +------------------------------------------------------------------- Fri Aug 8 08:48:16 CEST 2008 - jsuchome(a)suse.cz - button labels adapted to current style guide (bnc#398500) Modified: branches/SuSE-Code-11-SP2-Branch/profile-manager/src/ProfileManager.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/profi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/profile-manager/src/ProfileManager.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/profile-manager/src/ProfileManager.ycp Fri Jul 15 12:37:56 2011 @@ -871,7 +871,7 @@ if (Popup::YesNo (_("SCPM is currently locked because your system installation has changed. This is usually caused by a system update. Therefore, the data saved in -your profiles may be inconsistent, making it necessary to reininitialize +your profiles may be inconsistent, making it necessary to reinitialize SCPM. This also means the saved profiles will be lost and need to be set up again from scratch. Perform the reinitialization now? Modified: branches/SuSE-Code-11-SP2-Branch/profile-manager/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/profi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/profile-manager/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/profile-manager/src/helps.ycp Fri Jul 15 12:37:56 2011 @@ -77,12 +77,12 @@ This list contains all installed resource groups. A resource group usually represents a system service with all needed configuration files. Here, easily choose which services should be -handled by the profile management. Activate or deactive the groups by +handled by the profile management. Activate or deactivate the groups by double-clicking them. ") + // Configure Resources Dialog help 2/3 - _("To achive an even more customized setup, create your own + _("To achieve an even more customized setup, create your own resource groups or modify existing ones. With Add or Edit, enter the resource group editor. It allows activation and deactivation of resources and gives the possibility to create additional -- 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] r64849 - /tags/stable-2_21_0/profile-manager/
by jsuchome＠svn2.opensuse.org 15 Jul '11

15 Jul '11

Author: jsuchome Date: Fri Jul 15 12:37:27 2011 New Revision: 64849 URL: http://svn.opensuse.org/viewcvs/yast?rev=64849&view=rev Log: Created tag stable-2_21_0 for profile-manager Added: tags/stable-2_21_0/profile-manager/ - copied from r64848, trunk/profile-manager/ -- 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] r64848 - in /trunk/profile-manager: VERSION package/yast2-profile-manager.changes src/ProfileManager.ycp src/helps.ycp
by jsuchome＠svn2.opensuse.org 15 Jul '11

15 Jul '11

Author: jsuchome Date: Fri Jul 15 12:37:19 2011 New Revision: 64848 URL: http://svn.opensuse.org/viewcvs/yast?rev=64848&view=rev Log: - fixed typos (bnc#703203) - 2.21.0 Modified: trunk/profile-manager/VERSION trunk/profile-manager/package/yast2-profile-manager.changes trunk/profile-manager/src/ProfileManager.ycp trunk/profile-manager/src/helps.ycp Modified: trunk/profile-manager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/VERSION?rev=6484… ============================================================================== --- trunk/profile-manager/VERSION (original) +++ trunk/profile-manager/VERSION Fri Jul 15 12:37:19 2011 @@ -1 +1 @@ -2.18.2 +2.21.0 Modified: trunk/profile-manager/package/yast2-profile-manager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/package/yast2-pr… ============================================================================== --- trunk/profile-manager/package/yast2-profile-manager.changes (original) +++ trunk/profile-manager/package/yast2-profile-manager.changes Fri Jul 15 12:37:19 2011 @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 15 12:36:25 CEST 2011 - jsuchome(a)suse.cz + +- fixed typos (bnc#703203) +- 2.21.0 + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz Modified: trunk/profile-manager/src/ProfileManager.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/ProfileManag… ============================================================================== --- trunk/profile-manager/src/ProfileManager.ycp (original) +++ trunk/profile-manager/src/ProfileManager.ycp Fri Jul 15 12:37:19 2011 @@ -871,7 +871,7 @@ if (Popup::YesNo (_("SCPM is currently locked because your system installation has changed. This is usually caused by a system update. Therefore, the data saved in -your profiles may be inconsistent, making it necessary to reininitialize +your profiles may be inconsistent, making it necessary to reinitialize SCPM. This also means the saved profiles will be lost and need to be set up again from scratch. Perform the reinitialization now? Modified: trunk/profile-manager/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/helps.ycp?re… ============================================================================== --- trunk/profile-manager/src/helps.ycp (original) +++ trunk/profile-manager/src/helps.ycp Fri Jul 15 12:37:19 2011 @@ -77,7 +77,7 @@ This list contains all installed resource groups. A resource group usually represents a system service with all needed configuration files. Here, easily choose which services should be -handled by the profile management. Activate or deactive the groups by +handled by the profile management. Activate or deactivate the groups by double-clicking them. ") + -- 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] r64847 - /branches/SuSE-Code-11-SP2-Branch/profile-manager/
by jsuchome＠svn2.opensuse.org 15 Jul '11

15 Jul '11

Author: jsuchome Date: Fri Jul 15 12:29:56 2011 New Revision: 64847 URL: http://svn.opensuse.org/viewcvs/yast?rev=64847&view=rev Log: SP2 changes Added: branches/SuSE-Code-11-SP2-Branch/profile-manager/ (props changed) - copied from r64846, branches/SuSE-Code-11-SP1-Branch/profile-manager/ -- 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] r64846 - /tags/branch-Code-11-SP2-2_17_9/pos-installation/
by jsuchome＠svn2.opensuse.org 15 Jul '11

15 Jul '11

Author: jsuchome Date: Fri Jul 15 12:24:21 2011 New Revision: 64846 URL: http://svn.opensuse.org/viewcvs/yast?rev=64846&view=rev Log: Created tag branch-Code-11-SP2-2_17_9 for pos-installation Added: tags/branch-Code-11-SP2-2_17_9/pos-installation/ (props changed) - copied from r64845, branches/SuSE-Code-11-SP2-Branch/pos-installation/ -- 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] r64845 - in /branches/SuSE-Code-11-SP2-Branch/pos-installation: VERSION package/yast2-pos-installation.changes src/clients/inst_slepos_server_selection.ycp
by jsuchome＠svn2.opensuse.org 15 Jul '11

15 Jul '11

Author: jsuchome Date: Fri Jul 15 12:24:11 2011 New Revision: 64845 URL: http://svn.opensuse.org/viewcvs/yast?rev=64845&view=rev Log: - fixed typo (bnc#703237) - 2.17.9 Modified: branches/SuSE-Code-11-SP2-Branch/pos-installation/VERSION branches/SuSE-Code-11-SP2-Branch/pos-installation/package/yast2-pos-installation.changes branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp Modified: branches/SuSE-Code-11-SP2-Branch/pos-installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pos-i… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pos-installation/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/pos-installation/VERSION Fri Jul 15 12:24:11 2011 @@ -1 +1 @@ -2.17.8 +2.17.9 Modified: branches/SuSE-Code-11-SP2-Branch/pos-installation/package/yast2-pos-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pos-i… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pos-installation/package/yast2-pos-installation.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/pos-installation/package/yast2-pos-installation.changes Fri Jul 15 12:24:11 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 15 12:23:36 CEST 2011 - jsuchome(a)suse.cz + +- fixed typo (bnc#703237) +- 2.17.9 + +------------------------------------------------------------------- Thu Mar 25 10:02:11 CET 2010 - jsuchome(a)suse.cz - updated texts to make them more understandable (bnc#588712) Modified: branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pos-i… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp Fri Jul 15 12:24:11 2011 @@ -145,7 +145,7 @@ } else { // TRANSLATORS: Error message - Report::Error (_("An error occured in pattern selection\nStarting manual selection.")); + Report::Error (_("An error occurred in pattern selection\nStarting manual selection.")); return manual_package_selection (); } -- 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] r64844 - /branches/SuSE-Code-11-SP2-Branch/pos-installation/
by jsuchome＠svn2.opensuse.org 15 Jul '11

15 Jul '11

Author: jsuchome Date: Fri Jul 15 12:22:39 2011 New Revision: 64844 URL: http://svn.opensuse.org/viewcvs/yast?rev=64844&view=rev Log: changes for SLE11SP2 Added: branches/SuSE-Code-11-SP2-Branch/pos-installation/ (props changed) - copied from r64843, branches/SuSE-Code-11-SP1-Branch/pos-installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0