February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55205 - in /branches/SuSE-Code-11-Branch/ftp-server: VERSION package/yast2-ftp-server.changes
by juhliarik＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: juhliarik Date: Tue Feb 3 14:46:59 2009 New Revision: 55205 URL: http://svn.opensuse.org/viewcvs/yast?rev=55205&view=rev Log: new package 2.17.4 Modified: branches/SuSE-Code-11-Branch/ftp-server/VERSION branches/SuSE-Code-11-Branch/ftp-server/package/yast2-ftp-server.changes Modified: branches/SuSE-Code-11-Branch/ftp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ftp-serve… ============================================================================== --- branches/SuSE-Code-11-Branch/ftp-server/VERSION (original) +++ branches/SuSE-Code-11-Branch/ftp-server/VERSION Tue Feb 3 14:46:59 2009 @@ -1 +1 @@ -2.17.3 +2.17.4 Modified: branches/SuSE-Code-11-Branch/ftp-server/package/yast2-ftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ftp-serve… ============================================================================== --- branches/SuSE-Code-11-Branch/ftp-server/package/yast2-ftp-server.changes (original) +++ branches/SuSE-Code-11-Branch/ftp-server/package/yast2-ftp-server.changes Tue Feb 3 14:46:59 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 03 14:34:18 CEST 2008 - juhliarik(a)suse.cz + +- selected text for translation (bnc #446659) +- 2.17.4 + +------------------------------------------------------------------- Thu Nov 20 12:35:28 CET 2008 - juhliarik(a)suse.cz - updated ftp-server for using yast module Users (bnc #445463) -- 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] r55204 - /branches/SuSE-Code-11-Branch/ftp-server/src/FtpServer.ycp
by juhliarik＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: juhliarik Date: Tue Feb 3 14:30:25 2009 New Revision: 55204 URL: http://svn.opensuse.org/viewcvs/yast?rev=55204&view=rev Log: selected text for translation Modified: branches/SuSE-Code-11-Branch/ftp-server/src/FtpServer.ycp Modified: branches/SuSE-Code-11-Branch/ftp-server/src/FtpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ftp-serve… ============================================================================== --- branches/SuSE-Code-11-Branch/ftp-server/src/FtpServer.ycp (original) +++ branches/SuSE-Code-11-Branch/ftp-server/src/FtpServer.ycp Tue Feb 3 14:30:25 2009 @@ -243,7 +243,7 @@ "AnonAuthen" : "1", // 0 => anonymous only, 1 => authenticated only, 2=> both "AnonReadOnly" : "YES", "AnonCreatDirs" : "NO", - "Banner" : "Welcome message", + "Banner" : _("Welcome message"), "SSLEnable" : "NO", "SSLv2" : "NO", //enable/disable SSL version 2 (vsftpd only) "SSLv3" : "NO", //enable/disable SSL version 3 (vsftpd 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] r55203 - /branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc
by lslezak＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: lslezak Date: Tue Feb 3 14:30:00 2009 New Revision: 55203 URL: http://svn.opensuse.org/viewcvs/yast?rev=55203&view=rev Log: - better validity check Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Tue Feb 3 14:30:00 2009 @@ -42,7 +42,7 @@ it != name.end(); ++it) { - if (!isalnum(*it) && (*it) != '_') + if (!isupper(*it) && !islower(*it) && (*it) != '_') { *it = '_'; } -- 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] r55202 - in /branches/tmp/lslezak/core: dbus/namespace_service/ liby2dbus/src/
by lslezak＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: lslezak Date: Tue Feb 3 14:19:41 2009 New Revision: 55202 URL: http://svn.opensuse.org/viewcvs/yast?rev=55202&view=rev Log: - Dbus service - replace invalid characters in the name space by underscore ('_') when registering a DBus object (e.g. "YaPI::USERS"->"YaPI__USERS"), export two interfaces: org.opensuse.yast.modules.YCPValues for using marshalled YCPValues in '(bsv)' structure org.opensuse.yast.modules.Values for using native DBus types, missing types are encoded as strings Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.h branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Tue Feb 3 14:19:41 2009 @@ -36,6 +36,19 @@ } } +void MakeValidObjectName(std::string &name) +{ + for(std::string::iterator it = name.begin(); + it != name.end(); + ++it) + { + if (!isalnum(*it) && (*it) != '_') + { + *it = '_'; + } + } +} + DBusModulesServer::DBusModulesServer(const NameSpaceList &name_spaces) : e(this), wfm(NULL) { init_wfm(); @@ -55,12 +68,14 @@ else { ns->initialize(); - y2milestone("Imported name space: %s", it->c_str()); + std::string objname(*it); + MakeValidObjectName(objname); - nsmap[*it] = ns; + y2milestone("Imported name space: %s, using object name: %s", it->c_str(), objname.c_str()); + + nsmap[objname] = ns; } } - } DBusModulesServer::~DBusModulesServer() @@ -73,7 +88,7 @@ } } -void DBusModulesServer::registerFunctions(const std::string &interface_prefix) +void DBusModulesServer::registerFunctions(const std::string &interface_prefix, bool do_marshalling) { for (NameSpaceMap::const_iterator it = nsmap.begin(); it != nsmap.end(); @@ -106,7 +121,7 @@ DBusSignature sig; // add return type - std::string rett(Y2Dtype(rettype)); + std::string rett(do_marshalling ? "(bsv)" : Y2Dtype(rettype)); if (!rett.empty()) { @@ -121,7 +136,7 @@ bool params_ok = true; while(parindex < params) { - std::string partype(Y2Dtype(fptr->parameterType(parindex))); + std::string partype(do_marshalling ? "(bsv)" : Y2Dtype(fptr->parameterType(parindex))); if (!partype.empty()) { @@ -142,7 +157,7 @@ { sig.params = p; // register the function: register_function(object, interface, method, signature, handler) - register_method(ns->name(), interface_prefix, name, sig, e); + register_method(it->first, interface_prefix, name, sig, e); } } } @@ -167,25 +182,12 @@ case(YT_STRING) : ret = DBUS_TYPE_STRING_AS_STRING; break; case(YT_PATH) : ret = DBUS_TYPE_STRING_AS_STRING; break; case(YT_SYMBOL) : ret = DBUS_TYPE_STRING_AS_STRING; break; -// case(YT_LIST) : ret = DBUS_TYPE_ARRAY_AS_STRING; break; + case(YT_LIST) : ret = DBUS_TYPE_ARRAY_AS_STRING; break; + case(YT_MAP) : ret = DBUS_TYPE_ARRAY_AS_STRING; break; + case(YT_TERM) : ret = DBUS_TYPE_STRING_AS_STRING; break; + case(YT_CODE) : ret = DBUS_TYPE_STRING_AS_STRING; break; default : y2warning("Value type %d is not supported", vt); break; -/* - case(YT_MAP) : ret = DBUS_TYPE__AS_STRING; break; - case(YT_) : ret = DBUS_TYPE__AS_STRING; break; - - YT_BYTEBLOCK = 5, - YT_LIST = 8, - YT_TERM = 9, - YT_MAP = 10, - YT_CODE = 11, // YCode as YCPValue - YT_RETURN = 12, // value of 'return;' - YT_BREAK = 13, // value of 'break;' - YT_ENTRY = 14, // just a placeholder for a SymbolEntry belonging to a function (i.e. foreach()) - YT_ERROR = 15, // error value, will cause trouble - YT_REFERENCE = 16, // a reference to a variable - YT_EXTERNAL = 17 // a reference to an external data -*/ } return ret; @@ -228,7 +230,8 @@ bool DBusModulesServer::connect() { - registerFunctions("org.opensuse.yast.modules"); + registerFunctions("org.opensuse.yast.modules.YCPValues", true); + registerFunctions("org.opensuse.yast.modules.Values", false); return DBusServerBase::connect(SYSTEM, "org.opensuse.yast.modules"); } @@ -237,8 +240,9 @@ YCPValue ret; DBusMsg reply; - std::string method = request.method(); - std::string object = request.path(); + std::string method(request.method()); + std::string object(request.path()); + std::string interface(request.interface()); // remove the leading slash from the object name if (!object.empty() && object[0] == '/') @@ -246,7 +250,7 @@ object.erase(object.begin()); } - y2debug("Requested object: %s, method: %s", object.c_str(), method.c_str()); + y2debug("Requested object: %s, interface: %s, method: %s", object.c_str(), interface.c_str(), method.c_str()); constTypePtr t = searchFuncType(object, method); @@ -303,7 +307,15 @@ if (!ret.isNull()) { y2milestone("Result: %s", ret->toString().c_str()); - reply.addYCPValue(ret); + + if (interface == "org.opensuse.yast.modules.Values") + { + reply.addValue(ret); + } + else + { + reply.addYCPValue(ret); + } } return reply; Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h Tue Feb 3 14:19:41 2009 @@ -46,7 +46,7 @@ std::string Y2Dtype(constTypePtr type) const; // register the functions from the namespace to DBus service - void registerFunctions(const std::string &interface_prefix); + void registerFunctions(const std::string &interface_prefix, bool do_marshalling); DBusMsg handler(const DBusMsg &request); Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc Tue Feb 3 14:19:41 2009 @@ -222,6 +222,148 @@ return ret; } +bool DBusMsg::addValue(const YCPValue &val) +{ + if (val.isNull()) + { + y2milestone("Ignoring YCPNull value"); + return false; + } + + y2debug("Adding YCP value: %s", val->toString().c_str()); + + // create insert iterator + DBusMessageIter it; + dbus_message_iter_init_append(msg, &it); + + // add the value + bool ret = addValueAt(val, &it); + + return ret; +} + +bool DBusMsg::addValueAt(const YCPValue &val, DBusMessageIter *i) +{ + int type = typeInt(val); + + if (val->isInteger()) + { + dbus_int64_t i64 = val->asInteger()->value(); + addValue(type, &i64, i); + } + else if (val->isFloat()) + { + double d = val->asFloat()->value(); + addValue(type, &d, i); + } + else if (val->isString()) + { + const char *str = val->asString()->value().c_str(); + addValue(type, &str, i); + } + else if (val->isBoolean()) + { + dbus_bool_t b = val->asBoolean()->value(); + addValue(type, &b, i); + } + // add path and symbol as string + else if (val->isPath() || val->isSymbol() || val->isTerm() || val->isCode()) + { + std::string val_str(val->toString()); + const char *str = val_str.c_str(); + // add path as a string + addValue(type, &str, i); + } + else if (val->isList()) + { + YCPList lst = val->asList(); + int sz = lst->size(); + int index = 0; + + DBusMessageIter array_it; + + // open array container + y2debug("Opening array container"); + dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "v", &array_it); + while(index < sz) + { + y2debug("Adding YCP value at index %d", index); + // add VARIANT container + DBusMessageIter var_it; + dbus_message_iter_open_container(&array_it, DBUS_TYPE_VARIANT, typeStr(lst->value(index)), &var_it); + + // add the raw YCP value + addValueAt(lst->value(index), &array_it); + + y2debug("Closing VARIANT container"); + dbus_message_iter_close_container(&array_it, &var_it); + + index++; + } + + // close array container + y2debug("Closing array container"); + dbus_message_iter_close_container(i, &array_it); + } + else if (val->isMap()) + { + YCPMap map = val->asMap(); + + DBusMessageIter array_it; + + // open array container + y2debug("Opening DICT container"); + dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "{vv}", &array_it); + + for(YCPMapIterator mit = map.begin(); mit != map.end() ; ++mit) + { + YCPValue key = mit.key(); + YCPValue val = mit.value(); + + DBusMessageIter map_item_it; + y2debug("Opening map item container"); + + dbus_message_iter_open_container(&array_it, DBUS_TYPE_DICT_ENTRY, 0, &map_item_it); + + // add VARIANT container + DBusMessageIter var_it; + dbus_message_iter_open_container(&array_it, DBUS_TYPE_VARIANT, typeStr(key), &var_it); + + // add the key + addValueAt(key, &var_it); + + y2debug("Closing VARIANT container"); + dbus_message_iter_close_container(&array_it, &var_it); + + + // add VARIANT container + DBusMessageIter var_it2; + dbus_message_iter_open_container(&array_it, DBUS_TYPE_VARIANT, typeStr(val), &var_it2); + + // add the key + addValueAt(val, &var_it2); + + y2debug("Closing VARIANT container"); + dbus_message_iter_close_container(&array_it, &var_it2); + + // close map item + dbus_message_iter_close_container(&array_it, &map_item_it); + } + + // close array container + dbus_message_iter_close_container(i, &array_it); + } + else + { + y2error("Unsupported type %s, value: %s", Type::vt2type(val->valuetype())->toString().c_str(), + val->toString().c_str()); + + // TODO add as string? + } + + return true; +} + bool DBusMsg::addYCPValueRaw(const YCPValue &val, DBusMessageIter *i) { int type = typeInt(val); Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.h (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.h Tue Feb 3 14:19:41 2009 @@ -43,6 +43,8 @@ bool addDouble(double val); bool addYCPValue(const YCPValue &val); + bool addValue(const YCPValue &val); + YCPValue getYCPValue(int index) const; bool isMethodCall(const std::string &interface, const std::string &method) const; @@ -62,6 +64,7 @@ bool addValue(int type, void* data); bool addValue(int type, void* data, DBusMessageIter *i); + bool addValueAt(const YCPValue &val, DBusMessageIter *i); bool addYCPValue(const YCPValue &v, DBusMessageIter *i); bool addYCPValueRaw(const YCPValue &val, DBusMessageIter *i); void release(); Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc Tue Feb 3 14:19:41 2009 @@ -175,7 +175,7 @@ // handle Introspection request from "org.freedesktop.DBus.Introspectable" "Introspect" if (request.isMethodCall(DBUS_INTERFACE_INTROSPECTABLE, "Introspect")) { - y2milestone("Requesting path: %s", request.path().c_str()); + y2milestone("Introspecting object: %s", request.path().c_str()); std::string introspect; // root node? -- 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] r55201 - in /trunk/audit-laf/src: AuditLaf.ycp complex.ycp
by gs＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: gs Date: Tue Feb 3 11:09:43 2009 New Revision: 55201 URL: http://svn.opensuse.org/viewcvs/yast?rev=55201&view=rev Log: save inititial settings to be able to decide whether changes are made Modified: trunk/audit-laf/src/AuditLaf.ycp trunk/audit-laf/src/complex.ycp Modified: trunk/audit-laf/src/AuditLaf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/AuditLaf.ycp?rev=5… ============================================================================== --- trunk/audit-laf/src/AuditLaf.ycp (original) +++ trunk/audit-laf/src/AuditLaf.ycp Tue Feb 3 11:09:43 2009 @@ -44,10 +44,6 @@ import "Service"; -/** - * Prototypes - */ -global boolean Modified(); /** * Data was modified? @@ -80,9 +76,9 @@ boolean rules_locked = false; /* - * The rules have been checked + * The rules have been changed (sent to 'autitctl' to check the syntax) */ -boolean rules_checked = false; +boolean rules_changed = false; global void SetRulesLocked( boolean value ) { @@ -94,11 +90,11 @@ } global void SetRulesChanged( boolean value ) { - rules_checked = value; + rules_changed = value; } global boolean RulesChanged() { - return rules_checked; + return rules_changed; } /** @@ -134,6 +130,8 @@ modified = value; } + + global boolean ProposalValid() { return proposal_valid; } @@ -241,9 +239,15 @@ "disk_error_action" : "SUSPEND" ]; +/* + * Save settings initially read from /etc/audit/auditd.conf to be able + * to decide whether changes are made + */ +map <string, string> INITIAL_SETTINGS = $[]; + /** * Rules for the subsystem audit (passed via auditctl). - * Iinitially read from /etc/audit/audit.rules and edited in + * Initially read from /etc/audit/audit.rules and edited in * the rules editor. */ string RULES = ""; @@ -253,6 +257,16 @@ */ string INITIAL_RULES = ""; +/* + * Set data modified only if really has changed + */ +global void SetDataModified() { + if ( INITIAL_SETTINGS != SETTINGS || INITIAL_RULES != RULES ) + modified = true; + else + modified = false; +} + /** * Get value of given option from SEETINGS */ @@ -311,7 +325,7 @@ if ( rules != nil && rules != "" ) { RULES = rules; - // additionally save initial settings + // additionally save initial rules INITIAL_RULES = rules; return true; } @@ -349,6 +363,9 @@ if (val != nil) SETTINGS[key] = val; }); + // additionally save initial settings + INITIAL_SETTINGS = SETTINGS; + y2milestone("%1 has been read: %2", config_file, SETTINGS); return true; } Modified: trunk/audit-laf/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/complex.ycp?rev=55… ============================================================================== --- trunk/audit-laf/src/complex.ycp (original) +++ trunk/audit-laf/src/complex.ycp Tue Feb 3 11:09:43 2009 @@ -143,8 +143,6 @@ */ void StoreLogfileSettingsDialog (string id, map event) { - AuditLaf::SetModified( true ); - // Store all values in SETTINGS AuditLaf::SetAuditdOption( "freq", tostring( (integer)UI::QueryWidget( `id("freq"), `Value ) ) ); AuditLaf::SetAuditdOption( "num_logs", tostring( (integer)UI::QueryWidget( `id("num_logs"), `Value ) ) ); @@ -174,6 +172,8 @@ } } + AuditLaf::SetDataModified(); + y2milestone( "Store log file settings" ); } @@ -214,14 +214,14 @@ */ void StoreDispatcherDialog (string id, map event) { - AuditLaf::SetModified( true ); - // Store all values in SETTINGS foreach (string key, ["dispatcher", "disp_qos"], { AuditLaf::SetAuditdOption( key, (string) UI::QueryWidget(`id(key), `Value) ); }); + AuditLaf::SetDataModified( ); + y2milestone( "Store dispatcher dialog" ); } @@ -303,17 +303,17 @@ if ( ! FileUtils::Exists( file ) ) { - Report::Error( sformat( "%1 doesn't exist.\n", file ) + message ); + Report::Error( sformat(_("%1 doesn't exist.\n"), file ) + message ); ret = false; } else if ( ! FileUtils::IsFile( file ) ) { - Report::Error( sformat( "%1 is not a regular file.\n", file ) + message ); + Report::Error( sformat(_("%1 is not a regular file.\n"), file ) + message ); ret = false; } else if ( FileUtils::GetOwnerUserID( file ) != 0 ) { - Report::Error( sformat( "%1 not owned by root.\n", file ) + message ); + Report::Error( sformat(_("%1 not owned by root.\n"), file ) + message ); ret = false; } else @@ -323,7 +323,7 @@ if ( substring ( output["stdout"]:"", 0, 10 ) != "-rwxr-x---" ) { - Report::Error( sformat( "File permissiones of %1 NOT set to -rwxr-x---.\n", file ) + message ); + Report::Error( sformat(_("File permissiones of %1 NOT set to -rwxr-x---.\n"), file ) + message ); ret = false; } } @@ -338,8 +338,6 @@ string option = ""; string exec = ""; - AuditLaf::SetModified( true ); - foreach ( string key, ["space_left", "action_mail_acct", "admin_space_left" @@ -367,6 +365,8 @@ AuditLaf::SetAuditdOption( key, option ); } }); + + AuditLaf::SetDataModified( ); y2milestone( "Store disk space settings" ); } @@ -576,12 +576,12 @@ */ void StoreRulesDialog( string id, map event) { - AuditLaf::SetModified( true ); - string rules = (string)UI::QueryWidget( `id("rules"), `Value ); AuditLaf::SetRules( rules ); + AuditLaf::SetDataModified( ); + y2debug( "RULES: %1", rules ); y2milestone( "Store rules dialog" ); } -- 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] r55200 - /tags/branch-Code-11-2_17_65/yast2/
by mvidner＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: mvidner Date: Tue Feb 3 10:01:40 2009 New Revision: 55200 URL: http://svn.opensuse.org/viewcvs/yast?rev=55200&view=rev Log: Created tag branch-Code-11-2_17_65 for yast2 Added: tags/branch-Code-11-2_17_65/yast2/ - copied from r55199, branches/SuSE-Code-11-Branch/yast2/ -- 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] r55199 - in /branches/SuSE-Code-11-Branch/yast2: VERSION package/yast2.changes scripts/yast2
by mvidner＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: mvidner Date: Tue Feb 3 09:47:34 2009 New Revision: 55199 URL: http://svn.opensuse.org/viewcvs/yast?rev=55199&view=rev Log: Fixed prefix detection if called "bash -x yast2" (bnc#458385 c12). (manual merge from trunk) Modified: branches/SuSE-Code-11-Branch/yast2/VERSION branches/SuSE-Code-11-Branch/yast2/package/yast2.changes branches/SuSE-Code-11-Branch/yast2/scripts/yast2 Modified: branches/SuSE-Code-11-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/VER… ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-Branch/yast2/VERSION Tue Feb 3 09:47:34 2009 @@ -1 +1 @@ -2.17.64 +2.17.65 Modified: branches/SuSE-Code-11-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-Branch/yast2/package/yast2.changes Tue Feb 3 09:47:34 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 3 09:27:34 CET 2009 - mvidner(a)suse.cz + +- Fixed prefix detection if called "bash -x yast2" (bnc#458385 c12). +- 2.17.65 + +------------------------------------------------------------------- Fri Jan 30 11:14:42 CET 2009 - jsrain(a)suse.cz - fixed bash completion (bnc #470544) Modified: branches/SuSE-Code-11-Branch/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/scr… ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/scripts/yast2 (original) +++ branches/SuSE-Code-11-Branch/yast2/scripts/yast2 Tue Feb 3 09:47:34 2009 @@ -16,8 +16,11 @@ export PATH=/sbin:/usr/sbin:$PATH # allow for a different prefix -mydir=${0%/[YyZz]a[Ss][Tt]*} -if [[ -z "$mydir" || "$mydir" =~ ^/sbin/* ]]; then +# strip the basename off $0, which can be: (bnc#382216, bnc#458385) +# /sbin/yast2, /sbin/yast, yast2 (sh -x yast2 ...), /sbin//yast2 (PATH=/sbin/:...) +shopt -s extglob +mydir=${0%%*(/)[YyZz]a[Ss][Tt]?(2)} +if [[ -z "$mydir" || "$mydir" = /sbin ]]; then YAST_PREFIX=/usr else YAST_PREFIX=${mydir%/sbin} -- 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] r55198 - /branches/SuSE-Code-11-Branch/yast2/
by mvidner＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: mvidner Date: Tue Feb 3 09:36:18 2009 New Revision: 55198 URL: http://svn.opensuse.org/viewcvs/yast?rev=55198&view=rev Log: Initialized merge tracking via "svnmerge" with revisions "1-54122" from http://svn.opensuse.org/svn/yast/trunk/yast2 Modified: branches/SuSE-Code-11-Branch/yast2/ (props changed) -- 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] r55197 - /trunk/yast2/package/yast2.changes
by mvidner＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: mvidner Date: Tue Feb 3 09:31:00 2009 New Revision: 55197 URL: http://svn.opensuse.org/viewcvs/yast?rev=55197&view=rev Log: changes Modified: trunk/yast2/package/yast2.changes 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 Tue Feb 3 09:31:00 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Feb 3 09:27:34 CET 2009 - mvidner(a)suse.cz + +- Fixed prefix detection if called "bash -x yast2" (bnc#458385 c12). + +------------------------------------------------------------------- Fri Jan 30 11:14:42 CET 2009 - jsrain(a)suse.cz - fixed bash completion (bnc #470544) -- 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] r55196 - /trunk/yast2/scripts/yast2
by mvidner＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: mvidner Date: Tue Feb 3 09:26:15 2009 New Revision: 55196 URL: http://svn.opensuse.org/viewcvs/yast?rev=55196&view=rev Log: Fixed prefix detection if called "bash -x yast2" (bnc#458385 c12). Modified: trunk/yast2/scripts/yast2 Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=55196&r1… ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Tue Feb 3 09:26:15 2009 @@ -16,8 +16,11 @@ export PATH=/sbin:/usr/sbin:$PATH # allow for a different prefix -mydir=${0%/[YyZz]a[Ss][Tt]*} -if [[ -z "$mydir" || "$mydir" =~ ^/sbin/* ]]; then +# strip the basename off $0, which can be: (bnc#382216, bnc#458385) +# /sbin/yast2, /sbin/yast, yast2 (sh -x yast2 ...), /sbin//yast2 (PATH=/sbin/:...) +shopt -s extglob +mydir=${0%%*(/)[YyZz]a[Ss][Tt]?(2)} +if [[ -z "$mydir" || "$mydir" = /sbin ]]; then YAST_PREFIX=/usr else YAST_PREFIX=${mydir%/sbin} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0