October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r51744 - /trunk/network/src/modules/Lan.ycp
by mzugec＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: mzugec Date: Wed Oct 1 15:02:42 2008 New Revision: 51744 URL: http://svn.opensuse.org/viewcvs/yast?rev=51744&view=rev Log: fixed parameter in Service (rcnetwork instead of network) Modified: trunk/network/src/modules/Lan.ycp Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Wed Oct 1 15:02:42 2008 @@ -436,7 +436,7 @@ // NetworkModules::HwUp (); // For ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482) if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc())) y2milestone("For ssh or vnc installation don't reload/restart network during installation."); - else if (LanItems::force_restart) Service::Restart("rcnetwork"); + else if (LanItems::force_restart) Service::Restart("network"); else if(Service::Status("network")==0){ Service::Reload("network"); } else Service::Restart("network"); -- 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] r51743 - /trunk/audit-laf/src/helps.ycp
by gs＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: gs Date: Wed Oct 1 14:52:14 2008 New Revision: 51743 URL: http://svn.opensuse.org/viewcvs/yast?rev=51743&view=rev Log: fixed typo Modified: trunk/audit-laf/src/helps.ycp Modified: trunk/audit-laf/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/helps.ycp?rev=5174… ============================================================================== --- trunk/audit-laf/src/helps.ycp (original) +++ trunk/audit-laf/src/helps.ycp Wed Oct 1 14:52:14 2008 @@ -91,7 +91,7 @@ gets all audit events on stdin.") + /* dispatcher dialog help 3/3 */ _("Communication: Controls the communication -between the daemon and the dispatcher program."), +between the daemon and the dispatcher program."), /* disk space dialog help 1/4 */ "diskspace_settings" : _("<big>Auditd Disk Space Configuration</big> -- 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] r51742 - /trunk/yast2/library/modules/Popup.ycp
by sh-sh-sh＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: sh-sh-sh Date: Wed Oct 1 14:24:33 2008 New Revision: 51742 URL: http://svn.opensuse.org/viewcvs/yast?rev=51742&view=rev Log: fixed syntax error (doesn't anybody do _any_ testing any more???) Modified: trunk/yast2/library/modules/Popup.ycp Modified: trunk/yast2/library/modules/Popup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/Popup.ycp?… ============================================================================== --- trunk/yast2/library/modules/Popup.ycp (original) +++ trunk/yast2/library/modules/Popup.ycp Wed Oct 1 14:24:33 2008 @@ -330,6 +330,10 @@ ); any ret = nil; + + if ( focus != nil ) + UI::SetFocus(focus); + if (success == true) { ret = UI::UserInput(); UI::CloseDialog(); -- 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] r51741 - in /trunk/qt-pkg: package/yast2-qt-pkg.changes src/YQPkgList.cc
by tgoettlicher＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: tgoettlicher Date: Wed Oct 1 14:22:30 2008 New Revision: 51741 URL: http://svn.opensuse.org/viewcvs/yast?rev=51741&view=rev Log: Fixed bnc #418279: export list to text file fails Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgList.cc Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Wed Oct 1 14:22:30 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 1 13:59:45 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed bnc #418279: export list to text file fails + +------------------------------------------------------------------- Fri Sep 26 16:53:35 CEST 2008 - kmachalkova(a)suse.cz - Fixed crash in Languages filter: redefined sort function for Modified: trunk/qt-pkg/src/YQPkgList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgList.cc?rev=5174… ============================================================================== --- trunk/qt-pkg/src/YQPkgList.cc (original) +++ trunk/qt-pkg/src/YQPkgList.cc Wed Oct 1 14:22:30 2008 @@ -428,51 +428,51 @@ // wrong, so the formatting will be broken. QString header; - header.sprintf( "# %-18s %-30s | %10s | %-16s | %-16s\n\n", + header.sprintf( "# %-18s %-30s | %-40s | %-25s | %10s\n\n", (const char *) _( "Status" ).toUtf8(), (const char *) _( "Package" ).toUtf8(), - (const char *) _( "Size" ).toUtf8(), - (const char *) _( "Avail. Ver." ).toUtf8(), - (const char *) _( "Inst. Ver." ).toUtf8() + (const char *) _( "Summary" ).toUtf8(), + (const char *) _( "Installed (Available)" ).toUtf8(), + (const char *) _( "Size" ).toUtf8() ); file.write(header.toUtf8()); - // // Write all items - // -#if FIXME - const QTreeWidgetItem * item = firstChild(); - - while ( item ) + QTreeWidgetItemIterator it((QTreeWidget*) this); + while (*it) { - const YQPkgListItem * pkg = dynamic_cast<const YQPkgListItem *> (item); - - if ( pkg ) - { - QString candVersion = pkg->text( versionCol() ); - QString instVersion = pkg->text( instVersionCol() ); + const QTreeWidgetItem* item(*it); + const YQPkgListItem * pkg = dynamic_cast<const YQPkgListItem *> (item); - if ( candVersion.isEmpty() ) candVersion = "---"; - if ( instVersion.isEmpty() ) instVersion = "---"; + if ( pkg ) + { + QString version = pkg->text(versionStatusCol()); + if ( version.isEmpty() ) version = "---"; + + QString summary = pkg->text(summaryCol()); + if ( summary.isEmpty() ) summary = "---"; + if ( summary.size() > 40 ) + { + summary.truncate(40-3); + summary += "..."; + } - QString status = "[" + statusText( pkg->status() ) + "]"; + QString status = "[" + statusText( pkg->status() ) + "]"; QString format; - format.sprintf("%-20s %-30s | %10s | %-16s | %-16s\n", - (const char *) status.toUtf8(), - (const char *) pkg->text( nameCol() ), - (const char *) pkg->text( sizeCol() ), - (const char *) candVersion, - (const char *) instVersion + format.sprintf("%-20s %-30s | %-40s | %-25s | %10s\n", + (const char*) status.toUtf8(), + (const char*) pkg->text( nameCol() ).toUtf8(), + (const char*) summary.toUtf8(), + (const char*) version.toUtf8(), + (const char*) pkg->text( sizeCol() ).toUtf8() ); file.write(format.toUtf8()); } - - item = item->nextSibling(); + ++it; } -#endif // Clean up if ( file.isOpen() ) -- 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] r51740 - /tags/stable-2_17_33/network/
by mzugec＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: mzugec Date: Wed Oct 1 14:16:58 2008 New Revision: 51740 URL: http://svn.opensuse.org/viewcvs/yast?rev=51740&view=rev Log: Created tag stable-2_17_33 for network Added: tags/stable-2_17_33/network/ - copied from r51739, trunk/network/ -- 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] r51739 - in /trunk/network: VERSION package/yast2-network.changes src/modules/Lan.ycp
by mzugec＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: mzugec Date: Wed Oct 1 14:16:48 2008 New Revision: 51739 URL: http://svn.opensuse.org/viewcvs/yast?rev=51739&view=rev Log: - use Service::Restart instead of bash agent - don't restart network twice in Lan::Write() Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/Lan.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=51739&r1=517… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Oct 1 14:16:48 2008 @@ -1 +1 @@ -2.17.32 +2.17.33 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Oct 1 14:16:48 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 1 14:13:17 CEST 2008 - mzugec(a)suse.de + +- use Service::Restart instead of bash agent +- don't restart network twice in Lan::Write() +- 2.17.33 + +------------------------------------------------------------------- Thu Sep 25 19:28:57 CEST 2008 - mzugec(a)suse.de - copy udev files for s390 (bnc#422150) Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Wed Oct 1 14:16:48 2008 @@ -326,7 +326,7 @@ global define boolean Write() { y2milestone("Writing configuration"); - if(!write_only && NetHwDetection::running) NetHwDetection::Stop(); +// if(!write_only && NetHwDetection::running) NetHwDetection::Stop(); /* Stop the detection */ if(!LanItems::modified) { @@ -403,10 +403,6 @@ if(Abort()) return false; /* Progress step 6 */ ProgressNextStage(_("Writing hostname and DNS configuration...")); - // For ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482) - if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc())) y2milestone("For ssh or vnc installation don't reload/restart network during installation."); - else if (LanItems::force_restart) SCR::Execute(.target.bash, "rcnetwork restart"); - else NetworkService::StartStop (); // write resolv.conf after change from dhcp to static (#327074) // reload/restart network before this to put correct resolv.conf from dhcp-backup DNS::Write(); @@ -438,7 +434,13 @@ /* Progress step 9 */ ProgressNextStage(_("Activating network services...")); // NetworkModules::HwUp (); - NetworkService::StartStop (); + // For ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482) + if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc())) y2milestone("For ssh or vnc installation don't reload/restart network during installation."); + else if (LanItems::force_restart) Service::Restart("rcnetwork"); + else if(Service::Status("network")==0){ + Service::Reload("network"); + } else Service::Restart("network"); +// NetworkService::StartStop (); sleep(sl); } -- 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] r51738 - in /trunk/ldap-server/src: dialogs.ycp ldap-server_proposal.ycp
by rhafer＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: rhafer Date: Wed Oct 1 14:06:34 2008 New Revision: 51738 URL: http://svn.opensuse.org/viewcvs/yast?rev=51738&view=rev Log: create temporary service file for the Firewall-Widget to work (bnc#428364) Modified: trunk/ldap-server/src/dialogs.ycp trunk/ldap-server/src/ldap-server_proposal.ycp Modified: trunk/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Wed Oct 1 14:06:34 2008 @@ -194,7 +194,7 @@ { map <string, any> defaults = LdapServer::CreateInitialDefaults(); map<string, any> firewall_settings = $[ - "services": [ "ldap" , "ldaps" ], + "services": [ "service:openldap" ], "display_details": true, ]; map<string, any> firewall_widget = Modified: trunk/ldap-server/src/ldap-server_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/ldap-server_prop… ============================================================================== --- trunk/ldap-server/src/ldap-server_proposal.ycp (original) +++ trunk/ldap-server/src/ldap-server_proposal.ycp Wed Oct 1 14:06:34 2008 @@ -59,6 +59,12 @@ { y2milestone ("Openldap2 is not installed. --> service disabled"); LdapServer::WriteServiceEnabled (false); + // temporarly create the services file for the Firewallsettings + if (SCR::Read(.target.size, "/etc/sysconfig/SuSEfirewall2.d/services/openldap") <= 0) + { + SCR::Write(.target.string, "/etc/sysconfig/SuSEfirewall2.d/services/openldap", + "TCP=\"ldap ldaps\"\nUDP=\"ldap\"\n" ); + } } else { @@ -101,7 +107,7 @@ y2milestone("Zones used by firewall: %1", used_zones); foreach (string zone, used_zones, { - if (SuSEFirewall::IsServiceSupportedInZone ("ldap", zone)) + if (SuSEFirewall::IsServiceSupportedInZone ("service:openldap", zone)) is_ldap_enabled = true; }); } @@ -179,6 +185,11 @@ else if(func == "Write") { if( LdapServer::Configured() ) return ret; + if (!Package::Installed ("openldap2")) + { + //remove temp file + SCR::Execute(.target.remove, "/etc/sysconfig/SuSEfirewall2.d/services/openldap"); + } if( LdapServer::ReadServiceEnabled() ) { /* ensure openldap2 package is installed */ -- 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] r51737 - in /trunk/ldap-server/src: LdapServer.pm ldap-server.ycp
by rhafer＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: rhafer Date: Wed Oct 1 14:06:31 2008 New Revision: 51737 URL: http://svn.opensuse.org/viewcvs/yast?rev=51737&view=rev Log: revive commandline support (bnc#429486) Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/ldap-server.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Wed Oct 1 14:06:31 2008 @@ -656,6 +656,11 @@ Progress->Finish(); return 1; } + if ( ! $wasEnabled && $serviceEnabled ) + { + Service->Enable("ldap"); + Service->Start("ldap"); + } my $progressItems = [ _("Writing Sysconfig files"), _("Applying changes to Configuration Database"), _("Applying changes to /etc/openldap/ldap.conf"), @@ -1419,6 +1424,13 @@ return 1; } +## + # Read the list of configured Databases. + # + # @return A list of hashes. Each hash represents a database and has the keys + # 'type' (e.g. "hdb" or "bdb"), 'suffix' (the base DN of the database) and + # 'index' (the index number used by back-config to order databases correctly) + # BEGIN { $TYPEINFO {ReadDatabaseList} = ["function", [ "list", [ "map" , "string", "string"] ] ]; } sub ReadDatabaseList { Modified: trunk/ldap-server/src/ldap-server.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/ldap-server.ycp?… ============================================================================== --- trunk/ldap-server/src/ldap-server.ycp (original) +++ trunk/ldap-server/src/ldap-server.ycp Wed Oct 1 14:06:31 2008 @@ -34,22 +34,23 @@ ["enable", "disable" ] ); if( command == nil ) return false; -// LdapServer::WriteServiceEnabled( command == "enable" ); + LdapServer::WriteServiceEnabled( command == "enable" ); return true; } define boolean getDatabaseListHandler (map options) { -// map<string, any> edb = LdapServer::ReadDatabase(); -// -// string s = ""; -// foreach( string suffix, any value, edb, -// { -// s = s + suffix + " "; -// }); -// -// CommandLine::Print (RichText::Rich2Plain(" "+s)); + list<map<string, string> > dbList = LdapServer::ReadDatabaseList(); + + string s = ""; + foreach( map<string,string> db, dbList, + { + s = s + db["suffix"]:"" + " (" + db["type"]:"" + ") " + " "; + } + ); + + CommandLine::Print (RichText::Rich2Plain(" "+s)); return false; } @@ -63,48 +64,47 @@ // y2milestone("DBs: %1", edb); // // -// if (options["basedn"]:nil != nil && -// edb[options["basedn"]:""]:nil == nil) -// { -// db["suffix"] = options["basedn"]:""; -// } -// else -// { -// CommandLine::Print (_("No basedn provided or a database with the provided basedn does already \nexist")); -// return false; -// } -// if (options["rootdn"]:nil != nil) -// { -// db["rootdn"] = options["rootdn"]:""; -// } -// if (options["password"]:nil != nil) -// { -// db["passwd"] = options["password"]:""; -// } -// if (options["enctype"]:nil != nil) -// { -// db["cryptmethod"] = options["enctype"]:""; -// } -// if (options["dbdir"]:nil != nil) -// { -// db["directory"] = options["dbdir"]:""; -// } -// -// if(LdapServer::ReadServiceEnabled() == false) -// { -// // Database cannot be written when the service is not enabled -// LdapServer::WriteServiceEnabled(true); -// } -// + if (options["basedn"]:nil != nil ) + { + db["suffix"] = options["basedn"]:""; + } + else + { + CommandLine::Print (_("No basedn provided\n")); + return false; + } + db["type"] = options["type"]:"hdb"; + if (options["rootdn"]:nil != nil) + { + db["rootdn"] = options["rootdn"]:""; + } + if (options["password"]:nil != nil) + { + db["rootpw_clear"] = options["password"]:""; + } + db["pwenctype"] = options["enctype"]:"SSHA"; + if (options["dbdir"]:nil != nil) + { + db["directory"] = options["dbdir"]:""; + } + + if(LdapServer::ReadServiceEnabled() == false) + { + Report::Error(_("Database cannot be created when the service is not enabled")); + return false; + } + // y2milestone("db-options : %1", db); // -// ret = LdapServer::AddDatabase(db); -// -// if(!ret) -// { -// CommandLine::Print (_("Error while adding the database")); -// return false; -// } + ret = LdapServer::AddDatabase(0,db, true); + + if(!ret) + { + CommandLine::Print (_("Error while adding the database")); + map<string, string> err = LdapServer::ReadError(); + Report::Error(err["msg"]:"" + " " + err["details"]:""); + return false; + } return true; } @@ -112,87 +112,38 @@ string s = ""; integer i = 0; -// foreach(string v, LdapServer::ReadSchemaIncludeList (), -// { -// i = i + 1; -// s = s + tostring(i) + " "+ v +" "; -// }); -// -// CommandLine::Print (RichText::Rich2Plain(" "+s)); + foreach(string v, LdapServer::ReadSchemaList (), + { + if ( v != "schema" ) // skip the baseentry (hardcoded schema) + s = s + " "+ v +" "; + }); + + CommandLine::Print (RichText::Rich2Plain(" "+s)); return false; // do not call Write... } define boolean addSchemaHandler (map options ) { - boolean ret = false; -// if (options["file"]:"" != "") -// { -// string file = options["file"]:""; -// if(options["pos"]:"" != "") -// { -// integer pos = tointeger (options["pos"]:""); -// if (pos == nil || pos < 0) -// { -// // error: wrong input (probably string or negative integer) -// Report::Error (_("The value for pos must be a positive integer.")); -// return false; -// } -// -// list<string> l = LdapServer::ReadSchemaIncludeList (); -// list<string> rl = []; -// boolean added = false; -// integer i = 0; -// foreach(string s, l, -// { -// i = i + 1; -// if(i == pos) -// { -// rl = add(rl, file); -// added = true; -// } -// rl = add(rl, s); -// }); -// if(!added) -// { -// rl = add(rl, file); -// } -// LdapServer::WriteSchemaIncludeList (rl); -// ret = true; -// } -// } - - return ret; -} - -define boolean delSchemaHandler (map options ) { - - boolean ret = false; -// if(options["pos"]:"" != "") -// { -// integer pos = tointeger (options["pos"]:""); -// if (pos == nil || pos < 0) -// { -// // error: wrong input (probably string or negative integer) -// Report::Error (_("The value for pos must be a positive integer.")); -// return false; -// } -// -// list<string> l = LdapServer::ReadSchemaIncludeList (); -// list<string> rl = []; -// integer i = 0; -// foreach(string s, l, -// { -// i = i + 1; -// if(i != pos) -// { -// rl = add(rl, s); -// } -// }); -// LdapServer::WriteSchemaIncludeList (rl); -// ret = true; -// } - - return ret; + if (options["file"]:"" != "") + { + string file = options["file"]:""; + if ( regexpmatch( file, ".*\.schema$" ) ) + { + if (! LdapServer::AddSchemaToSchemaList(file) ) { + map<string, string> err = LdapServer::ReadError(); + Report::Error(err["msg"]:"" + " " + err["details"]:""); + return false; + } + } + else if (! LdapServer::AddLdifToSchemaList(file) ) + { + map<string, string> err = LdapServer::ReadError(); + Report::Error(err["msg"]:"" + " " + err["details"]:""); + return false; + } + return true; + } + return false; } @@ -225,14 +176,14 @@ "handler" : addSchemaHandler, "help" : _("Add a schema to the list"), ], - "delSchema": $[ - "handler" : delSchemaHandler, - "help" : _("Delete a schema from the list"), - ], ], "options" : $[ "enable" : $[ "help" : _("Enable the service") ], "disable" : $[ "help" : _("Disable the service") ], + "type" : $[ + "help" : _("Database type (\"hdb\" or \"bdb\")"), + "type" : "string" + ], "basedn" : $[ "help" : _("Base DN for the database"), "type" : "string" @@ -264,11 +215,10 @@ ], "mappings" : $[ "service" :[ "enable", "disable" ], - "addDatabase" : [ "basedn", "rootdn", "password", "enctype", "dbdir" ], + "addDatabase" : [ "basedn", "rootdn", "password", "enctype", "dbdir", "type" ], "getDatabaseList" : [], "getSchemaList" : [], - "addSchema": [ "file", "pos" ], - "delSchema": [ "pos" ] + "addSchema": [ "file" ] ] ]; -- 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] r51736 - /trunk/ldap-server/src/agent/SlapdConfigAgent.cc
by rhafer＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: rhafer Date: Wed Oct 1 14:06:27 2008 New Revision: 51736 URL: http://svn.opensuse.org/viewcvs/yast?rev=51736&view=rev Log: check result of opening schema files (bnc#431168) Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Wed Oct 1 14:06:27 2008 @@ -1387,6 +1387,14 @@ std::string filename = arg->asString()->value_cstr(); y2milestone("adding Ldif File: %s", filename.c_str()); std::ifstream ldifFile(filename.c_str()); + if ( ! ldifFile ) + { + lastError->add( YCPString("summary"), + YCPString("Error while opening Schema file") ); + lastError->add( YCPString("description"), + YCPString("") ); + return YCPBoolean(false); + } try { LdifReader ldif(ldifFile); if ( ldif.readNextRecord() ) @@ -1434,6 +1442,14 @@ y2milestone("RDN will be: %s", dn.c_str()); std::ifstream input(filename.c_str()); + if ( ! input ) + { + lastError->add( YCPString("summary"), + YCPString("Error while opening Schema file") ); + lastError->add( YCPString("description"), + YCPString("") ); + return YCPBoolean(false); + } std::string schemaLine; LDAPEntry entry(dn), oldEntry; entry.addAttribute( LDAPAttribute( "objectClass", "olcSchemaConfig" ) ); -- 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] r51735 - in /trunk/storage/storage/src/include: ep-dialogs.ycp ep-hd-dialogs.ycp ep-hd-lib.ycp
by kmachalkova＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: kmachalkova Date: Wed Oct 1 13:55:10 2008 New Revision: 51735 URL: http://svn.opensuse.org/viewcvs/yast?rev=51735&view=rev Log: Resizing the partitions, this time for real Modified: trunk/storage/storage/src/include/ep-dialogs.ycp trunk/storage/storage/src/include/ep-hd-dialogs.ycp trunk/storage/storage/src/include/ep-hd-lib.ycp Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Wed Oct 1 13:55:10 2008 @@ -423,7 +423,7 @@ } //data i.e. partition - map<symbol, any> DlgResize(map <string, any> &data , map <string, any> disk, symbol flavour) + boolean DlgResize(map <string, any> &data , map <string, any> disk, symbol flavour) { integer cyl_size = disk["cyl_size"]:1; integer free_cyl_after = Storage::FreeCylAfter( disk, data); @@ -442,10 +442,9 @@ integer used = 0; integer free = 0; integer total = 0; - //leave this 5 for now, will be different for Windows integer min_free = 5; - // Unit for partition resizing - currently Megabytes + // Unit for partition resizing string unit = _("MB"); integer factor = 1024*1024; @@ -453,6 +452,23 @@ string field_label_free = ""; string field_label_vg_free = ""; + //Depending on size of the partition, + //set correct division factor and units + void AdjustUnits ( map size_data ) + { + + //for partitions with free space less than ~10GB we'll + //keep using MBs to allow fine-grained + //size adjusting + if( size_data["df_free"]:0 > 10*1024*factor ) + { + factor = factor * 1024; + unit = _("GB"); + } + + min_free = (factor==1024*1024) ? 5 : 1; + } + map AdjustSwapPartitionDf ( map size_data) { map ret = size_data; @@ -462,6 +478,11 @@ return ret; } + integer ToUI (integer i) + { + return i / factor; + } + list <string> BarGraphLabels() { string used = ""; @@ -500,20 +521,14 @@ heading = sformat(_("Resize Partition %1"), device); map size_data = Storage::GetFreeSpace( device, 0, used_fs, true); - y2internal("zirafa %1 %2", size_data["used"]:0, size_data["df_free"]:0); - - if( size_data["df_free"]:0 > 15*1024*factor ) - { - factor = factor * 1024; - unit = _("GB"); - } + AdjustUnits( size_data ); if ( Partitions::IsSwapPartition( fsid ) ) size_data = AdjustSwapPartitionDf( size_data ); - used = size_data["used"]:0 / factor; - free = size_data["df_free"]:0 / factor; - av_space = av_space / factor; + used = ToUI( size_data["used"]:0 ); + free = ToUI( size_data["df_free"]:0 ); + av_space =ToUI( av_space ); total = used + free + av_space; // TODO: see texts in inst_custom_part.ycp @@ -558,8 +573,8 @@ content, `Left(`Label( `id(`free), sformat(_("Free Space Remaining: %1 MB"), free ))), `VSpacing(1.0), - `Left(`Label( sformat(_("Minimum Partition Size: %1 MB"), used + min_free ))), - `Left(`Label( sformat(_("Maximum Partition Size: %1 MB"), total ))), + `Left(`Label( sformat(_("Minimum Partition Size: %1 %2"), used + min_free, unit ))), + `Left(`Label( sformat(_("Maximum Partition Size: %1 %2"), total, unit ))), //`PartitionSplitter(lv_used, free, vg_free, vg_min_free, lv_min_free, // bargraph_label_used, bargraph_label_free, // bargraph_label_vg_free, field_label_free, @@ -573,23 +588,47 @@ ); any widget = nil; + integer new_size = -1; + integer old_size = used + free; + do { widget = UI::UserInput(); - if (widget == `new_size) - { - integer new_size = (integer) UI::QueryWidget(`id(`new_size), `Value); - integer new_free = new_size - used ; - UI::ChangeWidget(`id(`graph), `Values, [ used, new_free, total - (new_free + used) ]); - UI::ChangeWidget(`id(`free), `Value, sformat(_("Free Space Remaining: %1 MB"), new_free)); + switch ( (symbol) widget) + { + case `new_size: + { + new_size = (integer) UI::QueryWidget(`id(`new_size), `Value); + integer new_free = new_size - used ; + UI::ChangeWidget(`id(`graph), `Values, [ used, new_free, total - (new_free + used) ]); + UI::ChangeWidget(`id(`free), `Value, sformat(_("Free Space Remaining: %1 %2"), new_free, unit)); + break; + } + case `ok: + { + if ( new_size != old_size ) + { + //mark partition for resizing + data["resize"] = true; + //calculate the difference + list old_reg = data["region"]:[]; + list new_reg = [ data["region",0]:0, PartedSizeToCly( (tofloat(new_size*factor)), cyl_size ) ]; + + integer diff = old_reg[1]:0 - new_reg[1]:0; + y2internal("snehulak %1", diff); + data["region"] = new_reg; + } + break; + } + case `cancel: + break; } } while ( widget != `cancel && widget != `ok); UI::CloseDialog(); - return $[ `widget : widget, - `size : 42 ]; + return ( widget == `ok); } Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Wed Oct 1 13:55:10 2008 @@ -275,8 +275,8 @@ } - void DlgResizePartition( map<string, any> data, map <string, any> disk ) + boolean DlgResizePartition( map<string, any> &data, map <string, any> disk ) { - DlgResize(data, disk, `part); + return DlgResize(data, disk, `part); } } Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Wed Oct 1 13:55:10 2008 @@ -260,7 +260,11 @@ } //Need to pass data on the whole disk, to determine free/available space - DlgResizePartition(data, disk); + if ( DlgResizePartition(data, disk) ) + { + target_map = Storage::SetPartition( target_map, data ); + Storage::SetTargetMap( target_map ); + } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0