October 2008 - YaST Commits - openSUSE Mailing Lists

[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

[yast-commit] r51734 - /trunk/wagon/yast2-wagon.spec.in
by locilka＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: locilka Date: Wed Oct 1 13:50:05 2008 New Revision: 51734 URL: http://svn.opensuse.org/viewcvs/yast?rev=51734&view=rev Log: Include also *.ybc files in the final RPM Modified: trunk/wagon/yast2-wagon.spec.in Modified: trunk/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/yast2-wagon.spec.in?rev=51… ============================================================================== --- trunk/wagon/yast2-wagon.spec.in (original) +++ trunk/wagon/yast2-wagon.spec.in Wed Oct 1 13:50:05 2008 @@ -7,7 +7,7 @@ BuildArchitectures: noarch -Summary: YaST - Product Migration Workflow +Summary: YaST2 - Product Migration Workflow %description - @@ -24,6 +24,7 @@ %defattr(-,root,root) @clientdir@/*.ycp @moduledir@/*.ycp +@moduledir@/*.ybc %dir /usr/share/YaST2/control /usr/share/YaST2/control/online_migration.xml %doc @docdir@ -- 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] r51733 - in /trunk/installation: control/control.SLES.xml package/yast2-installation.changes
by locilka＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: locilka Date: Wed Oct 1 13:43:04 2008 New Revision: 51733 URL: http://svn.opensuse.org/viewcvs/yast?rev=51733&view=rev Log: - Changing pattern "Documentation" to "documentation" (bnc #431218) Modified: trunk/installation/control/control.SLES.xml trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Wed Oct 1 13:43:04 2008 @@ -123,7 +123,7 @@ <system_scenarios config:type="list"> <system_scenario> <id>scenario_physical_machine</id> - <patterns>base x11 gnome apparmor print_server 32bit 64bit x86 Documentation</patterns> + <patterns>base x11 gnome apparmor print_server 32bit 64bit x86 documentation</patterns> <icon>yast-system</icon> </system_scenario> <system_scenario> @@ -133,7 +133,7 @@ </system_scenario> <system_scenario> <id>scenario_virtualization_host</id> - <patterns>base x11 gnome apparmor print_server 32bit 64bit x86 Documentation</patterns> + <patterns>base x11 gnome apparmor print_server 32bit 64bit x86 documentation</patterns> <icon>yast-vm-management</icon> </system_scenario> </system_scenarios> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Oct 1 13:43:04 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 1 13:42:18 CEST 2008 - locilka(a)suse.cz + +- Changing pattern "Documentation" to "documentation" (bnc #431218) + +------------------------------------------------------------------- Tue Sep 30 13:20:09 CEST 2008 - locilka(a)suse.cz - Replacing "networkmanager" proposal call with "general" -- 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] r51732 - /tags/stable-2_17_0/wagon/
by locilka＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: locilka Date: Wed Oct 1 13:37:27 2008 New Revision: 51732 URL: http://svn.opensuse.org/viewcvs/yast?rev=51732&view=rev Log: Er, grf Removed: tags/stable-2_17_0/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] r51731 - in /trunk/packager/src: clients/repositories.ycp include/repositories_include.ycp
by lslezak＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: lslezak Date: Wed Oct 1 13:35:24 2008 New Revision: 51731 URL: http://svn.opensuse.org/viewcvs/yast?rev=51731&view=rev Log: - better support for services Modified: trunk/packager/src/clients/repositories.ycp trunk/packager/src/include/repositories_include.ycp Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Wed Oct 1 13:35:24 2008 @@ -205,6 +205,18 @@ list<map> itemList = repo_mode ? sourceStatesOut : serviceStatesOut; + // displaye only repositories from the selected service + if (repo_mode && service_name != "") + { + itemList = filter(map repo, itemList, + { + return repo["service"]:"" == service_name; + } + ); + + y2internal("table items: %1", itemList); + } + integer numItems = size(itemList); integer i = 0; @@ -296,10 +308,37 @@ } } + void clearRepoInfo() + { + if (textmode()) + { + UI::ChangeWidget(`id(`name), `Label, ""); + UI::ChangeWidget(`id(`url), `Label, ""); + UI::ChangeWidget(`id(`category), `Label, ""); + UI::ChangeWidget(`id(`service), `Label, ""); + } + else + { + UI::ChangeWidget(`id(`repo_info), `Value, ""); + } + + UI::ChangeWidget (`id (`enable), `Value, false); + UI::ChangeWidget (`id (`autorefresh), `Value, false); + + if (UI::WidgetExists(`id(`priority))) + { + // priority is displayed only for repositories + UI::ChangeWidget (`id (`priority), `Value, default_priority); + } + } + void fillCurrentRepoInfo () { integer selected = (integer)UI::QueryWidget (`id (`table), `CurrentItem); if (selected == nil) + { + clearRepoInfo(); return; + } map data = (repository_view) ? sourceStatesOut[selected]:$[] : serviceStatesOut[selected]:$[]; @@ -334,6 +373,25 @@ return ret; } + list<string> newServices (list<map<string,any> > statesOld, + list<map<string,any> > statesNew) { + y2milestone ("Services from %1 To %2", statesOld, statesNew); + list<string> ret = []; + + map<string, boolean> seen = listmap ( + map<string, any> srv, statesOld, + ``( $[(srv["alias"]:"") : (srv["enabled"]:true) ] )); + + foreach (map<string, any> srv, statesNew, { + string alias = srv["alias"]:""; + boolean newena = srv["enabled"]:true; + if (newena && ! seen[alias]:false) + ret = add (ret, alias); + }); + y2milestone ("Difference %1", ret); + return ret; + } + define void deleteSource( integer index ) ``{ integer srcid = sourceStatesOut[index, "SrcId"]:-1; @@ -398,11 +456,22 @@ } ); + // evaluate removed services +/* + foreach(integer id, servicesToDelete, + { + success = success && Pkg::ServiceDelete(id); + } + ); +*/ + success = success && KeyManager::Write(); // store in the persistent libzypp storage success = success && Pkg::SourceSaveAll(); // #176013 + success = success && Pkg::ServicesSave(); + return success; } @@ -716,66 +785,214 @@ // start the GPG key manager //RunGPGKeyMgmt(); } + else if (input == `tree) + { + // handle tree events here... + any current_item = UI::QueryWidget(`id(`tree), `CurrentItem); + + // rebuild the dialog if needed + y2internal("Current tree item: %1", current_item); + boolean update_table_widget = false; + + if (current_item == `repositories) + { + update_table_widget = !repository_view || displayed_service != ""; + y2milestone("Switching to repository view"); + repository_view = true; + displayed_service = ""; + } + else if (current_item == `services) + { + update_table_widget = repository_view; + y2milestone("Switching to service view"); + repository_view = false; + // display all services + displayed_service = ""; + } + else if (is(current_item, string)) + { + // switch to the selected repository + y2milestone("Switching to service %1", current_item); + repository_view = true; + // display the selected service + displayed_service = (string)current_item; + + // FIXME: always update the table? + update_table_widget = true; + } + + // update table widget + if (update_table_widget) + { + ReplaceWidgets(repository_view); + } + + // update table content + fillTable(repository_view, displayed_service); + fillCurrentRepoInfo(); + + // update the current item + current = (integer) UI::QueryWidget( `id( `table ), `CurrentItem ); + y2internal("UI refresh done"); + } else { current = (integer) UI::QueryWidget( `id( `table ), `CurrentItem ); y2debug( "Current item: %1", current ); - map<string, any> sourceState = sourceStatesOut[ current ]:$[]; + map<string, any> sourceState = $[]; + + if (repository_view) + { + if (displayed_service == "") + { + sourceState = sourceStatesOut[ current ]:$[]; + } + else + { + if (current != nil) + { + list<map<string,any> > sources_from_service = sourceStatesOut; + + sources_from_service = filter(map<string,any> src, sources_from_service, + { + return src["service"]:"" == displayed_service; + } + ); + + sourceState = sources_from_service[current]:$[]; + } + } + } + integer id = sourceState[ "SrcId" ]:-1; - if ( id < 0 && repository_view) { + if ( id < 0 && repository_view && displayed_service == "") { y2internal("Unable to determine repository id, broken repository?"); continue; } if ( input == `replace ) { - map generalData = Pkg::SourceGeneralData( id ); - string url = generalData[ "url" ]:""; - string old_url = url; - boolean auto_refresh = sourceState["autorefresh"]:true; - boolean plaindir = generalData["type"]:"YaST" == plaindir_type; + if (repository_view) + { + map generalData = Pkg::SourceGeneralData( id ); + string url = generalData[ "url" ]:""; + string old_url = url; + boolean auto_refresh = sourceState["autorefresh"]:true; + boolean plaindir = generalData["type"]:"YaST" == plaindir_type; - SourceDialogs::SetRepoName (sourceState["name"]:""); + SourceDialogs::SetRepoName (sourceState["name"]:""); - do { - url = SourceDialogs::EditPopupType(url, plaindir); + do { + url = SourceDialogs::EditPopupType(url, plaindir); - if ( size( url ) == 0 ) break; - if (url != old_url || plaindir != SourceDialogs::IsPlainDir()) - { - y2milestone ("URL or plaindir flag changed, recreating the source"); - // copy the refresh flag - createResult = createSource( url, SourceDialogs::IsPlainDir(), sourceState["do_refresh"]:false, SourceDialogs::GetRepoName ()); - if ( createResult == `ok ) { - deleteSource( current ); - fillTable(repository_view, displayed_service); - fillCurrentRepoInfo(); - } - } - else - { - y2milestone ("URL is the same, not recreating the source"); - sourceState["name"] = SourceDialogs::GetRepoName (); - sourceStatesOut[ current ] = sourceState; - fillTable(repository_view, displayed_service); - fillCurrentRepoInfo(); - createResult = `ok; - } + if ( size( url ) == 0 ) break; + if (url != old_url || plaindir != SourceDialogs::IsPlainDir()) + { + y2milestone ("URL or plaindir flag changed, recreating the source"); + // copy the refresh flag + createResult = createSource( url, SourceDialogs::IsPlainDir(), sourceState["do_refresh"]:false, SourceDialogs::GetRepoName ()); + if ( createResult == `ok ) { + deleteSource( current ); + fillTable(repository_view, displayed_service); + fillCurrentRepoInfo(); + } + } + else + { + y2milestone ("URL is the same, not recreating the source"); + sourceState["name"] = SourceDialogs::GetRepoName (); + sourceStatesOut[ current ] = sourceState; + fillTable(repository_view, displayed_service); + fillCurrentRepoInfo(); + createResult = `ok; + } + + } while ( createResult == `again ); + } + else // service view + { + map <string, any> service_info = serviceStatesOut[current]:$[]; + y2milestone("Editing service %1...", current); + string url = service_info["url"]:""; + string old_url = url; + + SourceDialogs::SetRepoName(service_info["name"]:""); + do { + url = SourceDialogs::EditPopupType(url, false); + + if ( size( url ) == 0 ) break; + if (url != old_url) + { + y2milestone ("URL of the service has been changed, recreating the service"); + // createSource() can potentially create a repository instead of a service + // Probe for a service first must be done before creating a new service + string service_type = Pkg::ServiceProbe(url); + y2milestone("Probed service type: %1", service_type); + + if (service_type != nil && service_type != "NONE") + { + createResult = createSource(url, false /*plaindir*/, false /*do_refresh*/, SourceDialogs::GetRepoName()); + if ( createResult == `ok ) + { + deleteService( current ); + fillTable(repository_view, displayed_service); + fillCurrentRepoInfo(); + + // refresh also the tree widget + UI::ChangeWidget(`id(`tree), `Items, buildTree()); + } + } + else + { + Report::Error(sformat(_("There is no service at URL: +%1"), url)); + } + } + else + { + y2milestone ("URL is the same, not recreating the service"); + string entered_service_name = SourceDialogs::GetRepoName(); - } while ( createResult == `again ); + if (service_info["name"]:nil != entered_service_name) + { + y2milestone("Updating name of the service to '%1'", entered_service_name); + service_info["name"] = entered_service_name; + serviceStatesOut[ current ] = service_info; + fillTable(repository_view, displayed_service); + fillCurrentRepoInfo(); + createResult = `ok; + + // refresh also the tree widget + UI::ChangeWidget(`id(`tree), `Items, buildTree()); + } + } + + } while ( createResult == `again ); + } } else if ( input == `refresh ) { - Pkg::SourceRefreshNow (id); + if (repository_view) + { + Pkg::SourceRefreshNow (id); - if (full_mode && sourceState["enabled"]:false) + if (full_mode && sourceState["enabled"]:false) + { + // force loading of the resolvables + Pkg::SourceSetEnabled(id, false); + Pkg::SourceSetEnabled(id, true); + } + } + else { - // force loading of the resolvables - Pkg::SourceSetEnabled(id, false); - Pkg::SourceSetEnabled(id, true); + // refresh a service + string service_name = (serviceStatesOut[current]:$[])["name"]:""; + + y2milestone("Refreshing service %1...", service_name); + Pkg::ServiceRefresh(service_name); } } else if ( input == `autorefresh_all || input == `refresh_enabled) @@ -863,7 +1080,7 @@ else { // yes-no popup - if ( Popup::YesNo( _("Delete the selected service from the list?") ) ) + if ( Popup::YesNo(sformat(_("Delete service %1?"), (serviceStatesOut[current]:$[])["name"]:""))) { deleteService( current ); fillTable(repository_view, displayed_service); @@ -975,43 +1192,6 @@ // do not refresh the item in the table current = -1; } - else if (input == `tree) - { - // handle tree events here... - any current_item = UI::QueryWidget(`id(`tree), `CurrentItem); - - // rebuild the dialog if needed - y2internal("Current tree item: %1", current_item); - boolean update_table_widget = false; - - if (current_item == `repositories) - { - update_table_widget = !repository_view; - y2milestone("Switching to repository view"); - repository_view = true; - } - else if (current_item == `services) - { - update_table_widget = repository_view; - y2milestone("Switching to service view"); - repository_view = false; - // display all services - displayed_service = ""; - } - - // update table widget - if (update_table_widget) - { - ReplaceWidgets(repository_view); - } - - // update table content - fillTable(repository_view, displayed_service); - fillCurrentRepoInfo(); - - // update the current item - current = (integer) UI::QueryWidget( `id( `table ), `CurrentItem ); - } else { y2warning("Unknown user input: %1", input); Modified: trunk/packager/src/include/repositories_include.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/repositorie… ============================================================================== --- trunk/packager/src/include/repositories_include.ycp (original) +++ trunk/packager/src/include/repositories_include.ycp Wed Oct 1 13:35:24 2008 @@ -64,6 +64,29 @@ PackageSystem::CheckAndInstallPackages(["cifs-mount"]); } + string service_type = Pkg::ServiceProbe(url); + y2milestone("Probed service type: %1", service_type); + + if (service_type != nil && service_type != "NONE") + { + y2milestone("Adding a service of type %1...", service_type); + string alias = "service"; + // all current aliases + list<string> aliases = Pkg::ServiceAliases(); + + // service alias must be unique + // if it already exists add "_<number>" suffix to it + integer idx = 1; + while (contains(aliases, alias)) + { + alias = sformat("service_%1", idx); + idx = idx + 1; + } + + Pkg::ServiceAdd(alias, url); + return `ok; + } + list<list<string> > new_repos = Pkg::RepositoryScan(url); y2milestone("new_repos: %1", new_repos); -- 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] r51730 - /trunk/packager/src/modules/SourceDialogs.ycp
by gs＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: gs Date: Wed Oct 1 13:27:28 2008 New Revision: 51730 URL: http://svn.opensuse.org/viewcvs/yast?rev=51730&view=rev Log: fixed typo (InputFiled ->InputField) Modified: trunk/packager/src/modules/SourceDialogs.ycp Modified: trunk/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceDialo… ============================================================================== --- trunk/packager/src/modules/SourceDialogs.ycp (original) +++ trunk/packager/src/modules/SourceDialogs.ycp Wed Oct 1 13:27:28 2008 @@ -1302,7 +1302,7 @@ // text entry `InputField (`id (`server), `opt (`hstretch), _("Server &Name"), server), (type == `http || type == `https) ? - `HSquash(`InputFiled (`id (`port), _("&Port"), port)) + `HSquash(`InputField (`id (`port), _("&Port"), port)) : `Empty() ), type == `samba -- 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] r51729 - /tags/stable-2_17_0/wagon/
by locilka＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: locilka Date: Wed Oct 1 13:24:19 2008 New Revision: 51729 URL: http://svn.opensuse.org/viewcvs/yast?rev=51729&view=rev Log: Created tag stable-2_17_0 for wagon Added: tags/stable-2_17_0/wagon/ - copied from r51728, 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] r51728 - /trunk/wagon/package/yast2-wagon.changes
by locilka＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: locilka Date: Wed Oct 1 13:24:10 2008 New Revision: 51728 URL: http://svn.opensuse.org/viewcvs/yast?rev=51728&view=rev Log: New (the very first ever) version Modified: trunk/wagon/package/yast2-wagon.changes 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 Wed Oct 1 13:24:10 2008 @@ -2,6 +2,7 @@ Mon Sep 29 12:44:37 CEST 2008 - locilka(a)suse.cz - Added possibility to restart YaST on request. +- 2.17.0 ------------------------------------------------------------------- Thu Sep 25 15:28:49 2008 - locilka(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] r51727 - in /trunk/audit-laf/src: audit-laf.ycp dialogs.ycp
by gs＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: gs Date: Wed Oct 1 13:14:14 2008 New Revision: 51727 URL: http://svn.opensuse.org/viewcvs/yast?rev=51727&view=rev Log: make command line work (remove UI:GetDisplayInfo which would initialise UI) Modified: trunk/audit-laf/src/audit-laf.ycp trunk/audit-laf/src/dialogs.ycp Modified: trunk/audit-laf/src/audit-laf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/audit-laf.ycp?rev=… ============================================================================== --- trunk/audit-laf/src/audit-laf.ycp (original) +++ trunk/audit-laf/src/audit-laf.ycp Wed Oct 1 13:14:14 2008 @@ -51,7 +51,7 @@ map cmdline_description = $[ "id" : "audit-laf", /* Command line help text for the Xaudit-laf module */ - "help" : _("Configuration of audit-laf"), + "help" : _("Configuration of Linux Audit Framework (LAF)"), "guihandler" : AuditLafSequence, "initialize" : AuditLaf::Read, "finish" : AuditLaf::Write, Modified: trunk/audit-laf/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/dialogs.ycp?rev=51… ============================================================================== --- trunk/audit-laf/src/dialogs.ycp (original) +++ trunk/audit-laf/src/dialogs.ycp Wed Oct 1 13:14:14 2008 @@ -36,17 +36,9 @@ include "audit-laf/helps.ycp"; -map current_ui_settings = UI::GetDisplayInfo(); - integer mbox_x = 1; integer mbox_y = 0.5; -// Tabs have a different layout in textmode -if (current_ui_settings["TextMode"]:false == true) { - mbox_x = 0; - mbox_y = 0; -} - term LogfileSettingsDialogContent () { return `MarginBox( mbox_x, mbox_y, `VBox( -- 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] r51726 - /trunk/audit-laf/src/complex.ycp
by gs＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: gs Date: Wed Oct 1 13:12:06 2008 New Revision: 51726 URL: http://svn.opensuse.org/viewcvs/yast?rev=51726&view=rev Log: remove superfluous sformat Modified: trunk/audit-laf/src/complex.ycp Modified: trunk/audit-laf/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/complex.ycp?rev=51… ============================================================================== --- trunk/audit-laf/src/complex.ycp (original) +++ trunk/audit-laf/src/complex.ycp Wed Oct 1 13:12:06 2008 @@ -363,7 +363,7 @@ map output = (map)SCR::Execute(.target.bash_output, sformat( "auditctl -R %1", tmpfile ) ); if ( output["exit"]:0 != 0 ) { - Report::Error( sformat( output["stderr"]:"" ) ); + Report::Error( output["stderr"]:"" ); } else { @@ -416,8 +416,7 @@ This means the rules are locked until next boot! If you really want this, make sure '-e 2' is the last entry in the rules file. If not, either enable or disable auditing. -To check or to change the rules, -please go back to rules editor."), +To check or to change the rules, please go back to rules editor."), Label::ContinueButton(), Label::BackButton(), `focus_no ); -- 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] r51725 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/ServiceManager.cc src/ServiceManager.h
by lslezak＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: lslezak Date: Wed Oct 1 13:08:40 2008 New Revision: 51725 URL: http://svn.opensuse.org/viewcvs/yast?rev=51725&view=rev Log: - fixed Pkg::ServiceRefresh() - search for the service URL and pass it to libzypp Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/ServiceManager.cc trunk/pkg-bindings/src/ServiceManager.h Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Wed Oct 1 13:08:40 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 1 13:02:00 CEST 2008 - lslezak(a)suse.cz + +- fixed Pkg::ServiceRefresh() - search for the service URL and pass + it to libzypp + +------------------------------------------------------------------- Mon Sep 29 14:27:21 CEST 2008 - lslezak(a)suse.cz - do not autorefresh remote repositories when there is no network Modified: trunk/pkg-bindings/src/ServiceManager.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/ServiceManager.… ============================================================================== --- trunk/pkg-bindings/src/ServiceManager.cc (original) +++ trunk/pkg-bindings/src/ServiceManager.cc Wed Oct 1 13:08:40 2008 @@ -114,11 +114,19 @@ return ret; } -bool ServiceManager::RefreshService(const std::string &alias, zypp::RepoManager &repomgr) const +bool ServiceManager::RefreshService(const std::string &alias, zypp::RepoManager &repomgr) { try { - repomgr.refreshService(alias); + PkgServices::iterator serv_it = _known_services.find(alias); + + if (serv_it == _known_services.end()) + { + y2error("Service '%s' does not exist", alias.c_str()); + return false; + } + + repomgr.refreshService(serv_it->second); return true; } catch(...) Modified: trunk/pkg-bindings/src/ServiceManager.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/ServiceManager.… ============================================================================== --- trunk/pkg-bindings/src/ServiceManager.h (original) +++ trunk/pkg-bindings/src/ServiceManager.h Wed Oct 1 13:08:40 2008 @@ -52,7 +52,7 @@ bool SetService(const std::string old_alias, const zypp::ServiceInfo &srv); - bool RefreshService(const std::string &alias, zypp::RepoManager &repomgr) const; + bool RefreshService(const std::string &alias, zypp::RepoManager &repomgr); std::string Probe(const zypp::Url &url, const zypp::RepoManager &repomgr) const; -- 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] r51724 - /tags/stable-2_17_5/add-on/
by locilka＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: locilka Date: Wed Oct 1 12:05:52 2008 New Revision: 51724 URL: http://svn.opensuse.org/viewcvs/yast?rev=51724&view=rev Log: Created tag stable-2_17_5 for add-on Added: tags/stable-2_17_5/add-on/ - copied from r51723, trunk/add-on/ -- 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] r51723 - in /trunk/add-on: VERSION package/yast2-add-on.changes src/add-on-workflow.ycp src/add-on.desktop src/add-on.ycp src/inst_language_add-on.ycp src/vendor.ycp
by locilka＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: locilka Date: Wed Oct 1 11:58:37 2008 New Revision: 51723 URL: http://svn.opensuse.org/viewcvs/yast?rev=51723&view=rev Log: - Changed texts (bnc #431177). - 2.17.5 Modified: trunk/add-on/VERSION trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp trunk/add-on/src/add-on.desktop trunk/add-on/src/add-on.ycp trunk/add-on/src/inst_language_add-on.ycp trunk/add-on/src/vendor.ycp Modified: trunk/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/VERSION?rev=51723&r1=5172… ============================================================================== --- trunk/add-on/VERSION (original) +++ trunk/add-on/VERSION Wed Oct 1 11:58:37 2008 @@ -1 +1 @@ -2.17.4 +2.17.5 Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.chan… ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Wed Oct 1 11:58:37 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 1 11:57:38 CEST 2008 - locilka(a)suse.cz + +- Changed texts (bnc #431177). +- 2.17.5 + +------------------------------------------------------------------- Tue Sep 30 10:53:19 CEST 2008 - locilka(a)suse.cz - Support for commandline: "help", "longhelp", and "xmlhelp" Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?r… ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Wed Oct 1 11:58:37 2008 @@ -847,7 +847,7 @@ if (! enable_back) Wizard::DisableBackButton(); if (! enable_next) Wizard::DisableNextButton(); - Wizard::SetDesktopIcon("vendor"); + Wizard::SetTitleIcon("vendor"); // disable delete button if no items listed // bug #203809 @@ -980,7 +980,7 @@ // Use new wizard window for adding new Add-On. // Do not use "Steps" dialog. Wizard::OpenNextBackDialog(); - Wizard::SetDesktopIcon("vendor"); + Wizard::SetTitleIcon("vendor"); symbol ret = RunWizard (); Wizard::CloseDialog(); @@ -1055,7 +1055,7 @@ `PushButton (`id (`delete), Label::DeleteButton()), `HStretch(), // TRANSLATORS: push button - `PushButton (`id (`packager), _("Run &Package Manager...")) + `PushButton (`id (`packager), _("Run &Software Manager...")) ) ), // TRANSLATORS: dialog help adp/1 Modified: trunk/add-on/src/add-on.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on.desktop?rev=51… ============================================================================== --- trunk/add-on/src/add-on.desktop (original) +++ trunk/add-on/src/add-on.desktop Wed Oct 1 11:58:37 2008 @@ -21,7 +21,7 @@ Icon=yast-addon Exec=/sbin/yast2 add-on -Name=Add-On Product -GenericName=Install an Add-On Product +Name=Add-On Products +GenericName=Install or remove add-on products X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/add-on/src/add-on.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on.ycp?rev=51723&… ============================================================================== --- trunk/add-on/src/add-on.ycp (original) +++ trunk/add-on/src/add-on.ycp Wed Oct 1 11:58:37 2008 @@ -90,7 +90,7 @@ false ); -Wizard::SetDesktopIcon("vendor"); +Wizard::SetTitleIcon("vendor"); Wizard::DisableBackButton(); Wizard::DisableAbortButton(); Modified: trunk/add-on/src/inst_language_add-on.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/inst_language_add-on.… ============================================================================== --- trunk/add-on/src/inst_language_add-on.ycp (original) +++ trunk/add-on/src/inst_language_add-on.ycp Wed Oct 1 11:58:37 2008 @@ -119,7 +119,7 @@ Label::BackButton(), Label::NextButton() ); - Wizard::SetDesktopIcon("yast-language"); + Wizard::SetTitleIcon("yast-language"); Wizard::DisableBackButton(); Wizard::DisableAbortButton(); Wizard::DisableNextButton(); @@ -178,7 +178,7 @@ Label::BackButton(), Label::OKButton() ); - Wizard::SetDesktopIcon("yast-language"); + Wizard::SetTitleIcon("yast-language"); Wizard::DisableBackButton(); Wizard::EnableAbortButton(); Wizard::EnableNextButton(); Modified: trunk/add-on/src/vendor.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/vendor.ycp?rev=51723&… ============================================================================== --- trunk/add-on/src/vendor.ycp (original) +++ trunk/add-on/src/vendor.ycp Wed Oct 1 11:58:37 2008 @@ -85,7 +85,7 @@ any result = nil; Wizard::CreateDialog(); - Wizard::SetDesktopIcon("vendor"); + Wizard::SetTitleIcon("vendor"); Wizard::HideAbortButton(); // VENDOR: main screen heading -- 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] r51722 - in /trunk/fingerprint-reader: agent-fprint/src/FPrintAgent.cc package/yast2-fingerprint-reader.changes
by jsuchome＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: jsuchome Date: Wed Oct 1 11:57:57 2008 New Revision: 51722 URL: http://svn.opensuse.org/viewcvs/yast?rev=51722&view=rev Log: - call _exit() to exit the child process, not exit() (bnc#430229) - reduced some debugging code Modified: trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes Modified: trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/agent-fprint/… ============================================================================== --- trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc (original) +++ trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc Wed Oct 1 11:57:57 2008 @@ -44,20 +44,18 @@ void FPrintAPI::catch_sigterm (int sig_num) { instance().finalize (); - exit (256); + _exit (256); } // de-initialize finger print reader (must be called at the end!) void FPrintAPI::finalize () { - y2internal ("finalize"); if (instance().data != NULL) { fp_print_data_free (instance().data); instance().data = NULL; } fp_exit(); - y2internal ("finalized"); } FPrintAPI::FPrintAPI() @@ -133,20 +131,18 @@ do { sleep (1); - y2internal ("Scan your finger now."); - - // FIXME not possible, this is total number of stages - y2milestone ("remaining stages: %d", fp_dev_get_nr_enroll_stages(dev)); r = fp_enroll_finger (dev, &enrolled_print); + y2debug ("retval: %d", r); + if (r < 0) { y2error ("Enroll failed with error %d", r); instance().finalize (); signal (15, SIG_DFL); return r; } -y2internal ("retval: %d", r); + if (write (write_fd, &r, sizeof (int)) == -1) y2error ("write to pipe failed: %d (%m)", errno); @@ -411,7 +407,7 @@ FPrintAPI::instance().acquire (data_pipe[1], path); y2milestone ("acquire done with state %d", state); close (data_pipe[1]); - exit (state); + _exit (state); } else // parent -> return { Modified: trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/package/yast2… ============================================================================== --- trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes (original) +++ trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes Wed Oct 1 11:57:57 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 1 11:53:49 CEST 2008 - jsuchome(a)suse.cz + +- call _exit() to exit the child process, not exit() (bnc#430229) + +------------------------------------------------------------------- Mon Sep 29 15:51:23 CEST 2008 - jsuchome(a)suse.cz - check the values returned by agent (fp_enroll_finger_img) in YCP -- 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] r51721 - /branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes
by juhliarik＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: juhliarik Date: Wed Oct 1 10:06:34 2008 New Revision: 51721 URL: http://svn.opensuse.org/viewcvs/yast?rev=51721&view=rev Log: added commnet about changes Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes Wed Oct 1 10:06:34 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 1 10:05:20 CEST 2008 - juhliarik(a)suse.cz + +- added fix for cloning sections (bnc #429525) + +------------------------------------------------------------------- Thu Sep 16 16:30:19 CEST 2008 - juhliarik(a)suse.cz - added fix for obtaining name of default section (bnc #364904) -- 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] r51720 - /branches/SuSE-SLE-10-SP3-Branch/bootloader/src/generic/section_type_widget.ycp
by juhliarik＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: juhliarik Date: Wed Oct 1 10:05:06 2008 New Revision: 51720 URL: http://svn.opensuse.org/viewcvs/yast?rev=51720&view=rev Log: added fix for cloning sections bnc #429525 Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/generic/section_type_widget.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/generic/section_type_widget.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/generic/section_type_widget.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/generic/section_type_widget.ycp Wed Oct 1 10:05:06 2008 @@ -66,8 +66,9 @@ else { BootCommon::current_section["name"] = ""; - BootCommon::current_section["original_name"] = ""; + // BootCommon::current_section["original_name"] = ""; BootCommon::current_section["__auto"] = false; + BootCommon::current_section["lines_cache_id"] = ""; } 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