Author: kmachalkova Date: Mon Dec 8 17:19:41 2008 New Revision: 53978 URL: http://svn.opensuse.org/viewcvs/yast?rev=53978&view=rev Log: Lost msvec's patch for parsing /etc/hosts (accepting tabs as valid field separators) found again Modified: trunk/network/package/yast2-network.changes trunk/network/src/services/host.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=53978&r1=53977&r2=53978&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Dec 8 17:19:41 2008 @@ -5,6 +5,8 @@ (bnc#455862) - Conversion to/from punycode for non-ascii character hostnames (bnc#448486) +- Fixed parsing ot /etc/hosts - tabs are valid field separators + (bnc#443237) ------------------------------------------------------------------- Thu Dec 4 14:45:42 CET 2008 - mzugec@suse.cz Modified: trunk/network/src/services/host.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/host.ycp?rev=53978&r1=53977&r2=53978&view=diff ============================================================================== --- trunk/network/src/services/host.ycp (original) +++ trunk/network/src/services/host.ycp Mon Dec 8 17:19:41 2008 @@ -82,10 +82,12 @@ return; } foreach (string s, names, { - list<string> row=splitstring(s, " "); - string aliases = mergestring(Punycode::DecodePunycodes(remove(row, 0)), " "); + + string name = regexpsub(s, "^([^ \t]+)[ \t].*$", "\\1"); + string aliases = regexpsub(s, "^[^ \t]+[ \t]+(.*)[ \t]*$", "\\1"); + term item = `item(`id(size(table_items)), host, - Punycode::DecodeDomainName(row[0]:""), aliases); + Punycode::DecodeDomainName(name), Punycode::DecodePunycodes( [aliases] )[0]:""); table_items = add(table_items, item); }); }); @@ -194,9 +196,12 @@ y2debug("olditem: %1", olditem); y2debug("entry: %1", entry); y2debug("oldentry: %1", oldentry); + string ip = item[1]:""; string oldip = olditem[1]:""; - deleted_items = add(deleted_items, oldip); + + if( ip != oldip) + deleted_items = add(deleted_items, oldip); y2debug("Deleting: %1 (%2)", oldip, ip); return item; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org