April 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r57006 - in /branches/tmp/tgoettlicher/yast2cc_rewrite/src: kcategorizedview.cpp kcategorydrawer.cpp kcategorydrawer.h modulesview.cpp modulesview.h
by kmachalkova＠svn.opensuse.org 28 Apr '09

28 Apr '09

Author: kmachalkova Date: Tue Apr 28 16:03:44 2009 New Revision: 57006 URL: http://svn.opensuse.org/viewcvs/yast?rev=57006&view=rev Log: Removed dependency on KDE headers Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorizedview.cpp branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorydrawer.cpp branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorydrawer.h branches/tmp/tgoettlicher/yast2cc_rewrite/src/modulesview.cpp branches/tmp/tgoettlicher/yast2cc_rewrite/src/modulesview.h Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorizedview.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorizedview.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorizedview.cpp Tue Apr 28 16:03:44 2009 @@ -22,13 +22,11 @@ #include "kcategorizedview_p.h" #include <math.h> // trunc on C99 compliant systems -#include <kdefakes.h> // trunc for not C99 compliant systems #include <QPainter> #include <QScrollBar> #include <QPaintEvent> -#include <kdebug.h> #include "kcategorydrawer.h" #include "kcategorizedsortfilterproxymodel.h" Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorydrawer.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorydrawer.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorydrawer.cpp Tue Apr 28 16:03:44 2009 @@ -24,9 +24,6 @@ #include <QStyleOption> #include <QApplication> -#include <kiconloader.h> -#include <kcategorizedsortfilterproxymodel.h> - #define HORIZONTAL_HINT 3 KCategoryDrawer::KCategoryDrawer() Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorydrawer.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorydrawer.h (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorydrawer.h Tue Apr 28 16:03:44 2009 @@ -21,7 +21,7 @@ #ifndef KCATEGORYDRAWER_H #define KCATEGORYDRAWER_H -//#include <kdeui_export.h> +#include "kcategorizedsortfilterproxymodel.h" #define KDEUI_EXPORT class QPainter; Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/modulesview.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/modulesview.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/modulesview.cpp Tue Apr 28 16:03:44 2009 @@ -23,11 +23,7 @@ #include <qlabel.h> #include <QListWidget> #include <qlayout.h> -#include <kiconloader.h> -#include <kdebug.h> -#include <kservicetypetrader.h> #include <QApplication> -#include <kdialog.h> #include "kcmsearch.h" #include "moduleiconitem.h" Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/modulesview.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/modulesview.h (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/modulesview.h Tue Apr 28 16:03:44 2009 @@ -26,7 +26,6 @@ #include <QListWidget> #include <QList> -#include <KService> /** * Overloaded to give a larger default size that fits with text of two lines. */ -- 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] r57005 - in /trunk/yast2: library/types/src/ library/types/testsuite/tests/ package/
by lslezak＠svn.opensuse.org 28 Apr '09

28 Apr '09

Author: lslezak Date: Tue Apr 28 15:57:28 2009 New Revision: 57005 URL: http://svn.opensuse.org/viewcvs/yast?rev=57005&view=rev Log: - URL.ycp - escape also non-ASCII characters in URL, added URLRecode.pm module (bnc#446395) Added: trunk/yast2/library/types/src/URLRecode.pm Modified: trunk/yast2/library/types/src/Makefile.am trunk/yast2/library/types/src/URL.ycp trunk/yast2/library/types/testsuite/tests/URL.out trunk/yast2/library/types/testsuite/tests/URL.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/types/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/src/Makefile… ============================================================================== --- trunk/yast2/library/types/src/Makefile.am (original) +++ trunk/yast2/library/types/src/Makefile.am Tue Apr 28 15:57:28 2009 @@ -1,6 +1,6 @@ # Makefile.am for yast2/library/types/src -module_DATA = $(wildcard *.ycp) +module_DATA = $(wildcard *.ycp) $(wildcard *.pm) EXTRA_DIST = $(module_DATA) include $(top_srcdir)/Makefile.am.common Modified: trunk/yast2/library/types/src/URL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/src/URL.ycp?… ============================================================================== --- trunk/yast2/library/types/src/URL.ycp (original) +++ trunk/yast2/library/types/src/URL.ycp Tue Apr 28 15:57:28 2009 @@ -17,6 +17,7 @@ import "Hostname"; import "String"; import "IP"; +import "URLRecode"; /** * TODO: @@ -200,9 +201,9 @@ pth = substring (pth, 1); } } - tokens["path"] = UnEscapeString(pth, transform_map_filename); - tokens["query"] = UnEscapeString(rawtokens[5]:"", transform_map_query); - tokens["fragment"] = UnEscapeString(rawtokens[7]:"", transform_map_passwd); + tokens["path"] = URLRecode::UnEscape(pth); + tokens["query"] = URLRecode::UnEscape(rawtokens[5]:""); + tokens["fragment"] = URLRecode::UnEscape(rawtokens[7]:""); /* Extract username:pass@host:port */ list userpass = regexptokenize(rawtokens[2]:"", "^" + @@ -216,8 +217,8 @@ ); y2debug("userpass=%1", userpass); - tokens["user"] = UnEscapeString(userpass[1]:"", transform_map_passwd); - tokens["pass"] = UnEscapeString(userpass[3]:"", transform_map_passwd); + tokens["user"] = URLRecode::UnEscape(userpass[1]:""); + tokens["pass"] = URLRecode::UnEscape(userpass[3]:""); tokens["port"] = userpass[7]:""; if(userpass[5]:"" != "") @@ -310,6 +311,8 @@ string url = ""; string userpass = ""; + y2debug("URL::Build(): input: %1", tokens); + if(regexpmatch(tokens["scheme"]:"", "^[[:alpha:]]*$")) { /* if (tokens["scheme"]:"" == "samba") url="smb"; @@ -318,12 +321,12 @@ y2debug("url: %1", url); if (tokens["user"]:"" != "") { - userpass = EscapeString(tokens["user"]:"", transform_map_passwd); + userpass = URLRecode::EscapePassword(tokens["user"]:""); y2milestone("Escaped username '%1' => '%2'", tokens["user"]:"", userpass); } if (size(userpass) != 0 && tokens["pass"]:"" != "" ) { - userpass = sformat("%1:%2", userpass, EscapeString(tokens["pass"]:"", transform_map_passwd) ); + userpass = sformat("%1:%2", userpass, URLRecode::EscapePassword(tokens["pass"]:"") ); } if (size(userpass) > 0 ) userpass = userpass + "@"; @@ -351,25 +354,25 @@ // path is not empty and doesn't start with "/" if (tokens["path"]:"" != "" && ! regexpmatch (tokens["path"]:"", "^/")) - url = sformat("%1/%2", url, EscapeString(tokens["path"]:"", transform_map_filename)); + url = sformat("%1/%2", url, URLRecode::EscapePath(tokens["path"]:"")); // patch is not empty and starts with "/" else if (tokens["path"]:"" != "" && regexpmatch (tokens["path"]:"", "^/")) { while (substring (tokens["path"]:"", 0, 2) == "//") tokens["path"] = substring (tokens["path"]:"", 1); if (tokens["scheme"]:"" == "ftp") { - url = sformat("%1/%%2f%2", url, substring(EscapeString(tokens["path"]:"", transform_map_filename), 1)); + url = sformat("%1/%%2f%2", url, substring(URLRecode::EscapePath(tokens["path"]:""), 1)); } else { - url = sformat("%1%2", url, EscapeString(tokens["path"]:"", transform_map_filename)); + url = sformat("%1%2", url, URLRecode::EscapePath(tokens["path"]:"")); } } y2debug("url: %1", url); if (tokens["query"]:"" != "" ) - url = sformat("%1?%2", url, EscapeString(tokens["query"]:"", transform_map_query)); + url = sformat("%1?%2", url, URLRecode::EscapeQuery(tokens["query"]:"")); if (tokens["fragment"]:"" != "" ) - url = sformat("%1#%2", url, EscapeString(tokens["fragment"]:"", transform_map_passwd)); + url = sformat("%1#%2", url, URLRecode::EscapePassword(tokens["fragment"]:"")); y2debug("url: %1", url); if (!Check(url)) { @@ -377,6 +380,8 @@ return ""; } + y2debug("URL::Build(): result: %1", url); + return url; } Added: trunk/yast2/library/types/src/URLRecode.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/src/URLRecod… ============================================================================== --- trunk/yast2/library/types/src/URLRecode.pm (added) +++ trunk/yast2/library/types/src/URLRecode.pm Tue Apr 28 15:57:28 2009 @@ -0,0 +1,87 @@ +#!/usr/bin/perl -w +# +# Author: Ladislav SlezÃ¡k <lslezak(a)novell.com> +# +# $Id:$ +# +# URLRecode.pm +# +# This is a replacement for URI::Encode perl module which cannot be used in inst-sys +# and to decrease the package dependencies +# + +package URLRecode; + +use strict; +use YaST::YCP qw(:LOGGING Boolean sformat);; + +our %TYPEINFO; +use strict; + +# local cache for char -> hex string conversion +our %escape_cache; + +# fill the cache +sub InitCache +{ + for(0..255) {$escape_cache{chr($_)} = sprintf("%%%02x", $_);} +} + + +# Escape password, user name and fragment part of URL string +# @param input input string +# @return string Escaped string +BEGIN{ $TYPEINFO{EscapePassword} = ["function", "string", "string"];} +sub EscapePassword +{ + my ($self, $escaped) = @_; + + if (!defined %escape_cache) { InitCache(); } + + $escaped =~ s/([^A-Za-z0-9\\-_.!~*'()])/$escape_cache{$1}/ge; + return $escaped; +} + +# Escape path part of URL string +# @param input input string +# @return string Escaped string +BEGIN{ $TYPEINFO{EscapePath} = ["function", "string", "string"];} +sub EscapePath +{ + my ($self, $escaped) = @_; + + if (!defined %escape_cache) { InitCache() }; + + $escaped =~ s/([^A-Za-z0-9\-_.!~*'()\/])/$escape_cache{$1}/ge; + return $escaped; +} + +# Escape query part of URL string +# @param input input string +# @return string Escaped string +BEGIN{ $TYPEINFO{EscapeQuery} = ["function", "string", "string"];} +sub EscapeQuery +{ + my ($self, $escaped) = @_; + + if (!defined %escape_cache) { InitCache(); } + + $escaped =~ s/([^A-Za-z0-9\\-_.!~*'()\/:=&])/$escape_cache{$1}/ge; + return $escaped; +} + + +# UnEscape an URL string, replace %<Hexnum><HexNum> sequences +# by character +# @param input input string +# @return string Unescaped string +BEGIN{ $TYPEINFO{UnEscape} = ["function", "string", "string"];} +sub UnEscape +{ + my ($self, $input) = @_; + + $input =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/ge; + return $input +} + +1; Modified: trunk/yast2/library/types/testsuite/tests/URL.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/testsuite/te… ============================================================================== --- trunk/yast2/library/types/testsuite/tests/URL.out (original) +++ trunk/yast2/library/types/testsuite/tests/URL.out Tue Apr 28 15:57:28 2009 @@ -21,6 +21,8 @@ Return ftp://ftp.example.com/%2fpath/to/dir Return ftp://ftp.example.com/%2fpath/to/dir Return ftp://ftp.example.com/%2fpath/to/dir +Return ftp://ftp.example.com/%2fpath/to/dir?param1=val1&param2=val2 +Return dir:///path/to/%c4%9b%c5%a1%c4%8d%c5%99%c5%be%c3%bd%c3%a1%c3%ad%c3%a9/dir Return ftp://[2001:de8:0:f123::1]/%2fpath/to/dir Return http://[2001:de8:0:f123::1]:8080/path/to/dir Return $["fragment":"", "host":"2001:de8:0:f123::1", "pass":"", "path":"/path/to/dir", "port":"", "query":"", "scheme":"http", "user":""] Modified: trunk/yast2/library/types/testsuite/tests/URL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/testsuite/te… ============================================================================== --- trunk/yast2/library/types/testsuite/tests/URL.ycp (original) +++ trunk/yast2/library/types/testsuite/tests/URL.ycp Tue Apr 28 15:57:28 2009 @@ -50,6 +50,10 @@ TEST(``(URL::Build($["scheme":"ftp","host":"ftp.example.com","path":"/path/to/dir"])), [], nil); TEST(``(URL::Build($["scheme":"ftp","host":"ftp.example.com","path":"//path/to/dir"])), [], nil); TEST(``(URL::Build($["scheme":"ftp","host":"ftp.example.com","path":"///path/to/dir"])), [], nil); +TEST(``(URL::Build($["scheme":"ftp","host":"ftp.example.com","path":"///path/to/dir", "query" : "param1=val1&param2=val2" ])), [], nil); + +// bnc #446395 - non-ASCII chars in path must be escaped +TEST(``(URL::Build($["scheme":"dir", "path":"/path/to/ÄÅ¡ÄÅÅ¾Ã½Ã¡ÃÃ©/dir"])), [], nil); // IPv6 tests TEST(``(URL::Build($["scheme":"ftp","host":"2001:de8:0:f123::1","path":"///path/to/dir"])), [], nil); 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 Apr 28 15:57:28 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 28 15:18:49 CEST 2009 - lslezak(a)suse.cz + +- URL.ycp - escape also non-ASCII characters in URL, added + URLRecode.pm module (bnc#446395) + +------------------------------------------------------------------- Mon Apr 20 16:11:35 CEST 2009 - jsrain(a)suse.cz - at start-up, check that /sys, /proc and /dev are not empty and -- 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] r57004 - /trunk/storage/libstorage/src/Dm.cc
by aschnell＠svn.opensuse.org 28 Apr '09

28 Apr '09

Author: aschnell Date: Tue Apr 28 15:12:09 2009 New Revision: 57004 URL: http://svn.opensuse.org/viewcvs/yast?rev=57004&view=rev Log: - use boost function Modified: trunk/storage/libstorage/src/Dm.cc Modified: trunk/storage/libstorage/src/Dm.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dm.cc?rev… ============================================================================== --- trunk/storage/libstorage/src/Dm.cc (original) +++ trunk/storage/libstorage/src/Dm.cc Tue Apr 28 15:12:09 2009 @@ -467,14 +467,7 @@ string Dm::devToTable( const string& dev ) { - string ret(undevDevice(dev)); - string::iterator it = ret.begin(); - while( it!=ret.end() ) - { - if( *it == '/' ) - *it = '|'; - ++it; - } + string ret = boost::replace_all_copy(undevDevice(dev), "/", "|"); if( dev!=ret ) y2mil("dev:" << dev << " ret:" << ret); return( ret ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57003 - /trunk/repair/src/OSRPkgVerify.ycp
by jreidinger＠svn.opensuse.org 28 Apr '09

28 Apr '09

Author: jreidinger Date: Tue Apr 28 12:00:55 2009 New Revision: 57003 URL: http://svn.opensuse.org/viewcvs/yast?rev=57003&view=rev Log: fix calling removed call Modified: trunk/repair/src/OSRPkgVerify.ycp Modified: trunk/repair/src/OSRPkgVerify.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRPkgVerify.ycp?rev=… ============================================================================== --- trunk/repair/src/OSRPkgVerify.ycp (original) +++ trunk/repair/src/OSRPkgVerify.ycp Tue Apr 28 12:00:55 2009 @@ -131,9 +131,6 @@ * module constructor: read packages with build problems */ global define void OSRPkgVerify()``{ - - initial_verified_packages = (map) - WFM::CallFunction ("osr_verified_packages"); Reset(); } -- 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] r57002 - in /trunk/theme: SLE/icons/16x16/apps/ SLE/icons/22x22/apps/ SLE/icons/32x32/apps/ SLE/icons/48x48/apps/ openSUSE/icons/16x16/apps/ openSUSE/icons/22x22/apps/ openSUSE/icons/32x32/apps/ op...
by jimmacfx＠svn.opensuse.org 28 Apr '09

28 Apr '09

Author: jimmacfx Date: Tue Apr 28 11:58:17 2009 New Revision: 57002 URL: http://svn.opensuse.org/viewcvs/yast?rev=57002&view=rev Log: slight updates on the SMT icon. Buttonize the larger sizes of the YAST app icon. Still very unhappy about it. Modified: trunk/theme/SLE/icons/16x16/apps/yast-SMT.png trunk/theme/SLE/icons/22x22/apps/yast-SMT.png trunk/theme/SLE/icons/22x22/apps/yast.png trunk/theme/SLE/icons/32x32/apps/yast-SMT.png trunk/theme/SLE/icons/32x32/apps/yast.png trunk/theme/SLE/icons/48x48/apps/yast-SMT.png trunk/theme/SLE/icons/48x48/apps/yast.png trunk/theme/openSUSE/icons/16x16/apps/yast-SMT.png trunk/theme/openSUSE/icons/22x22/apps/yast-SMT.png trunk/theme/openSUSE/icons/22x22/apps/yast.png trunk/theme/openSUSE/icons/32x32/apps/yast-SMT.png trunk/theme/openSUSE/icons/32x32/apps/yast.png trunk/theme/openSUSE/icons/48x48/apps/yast-SMT.png trunk/theme/openSUSE/icons/48x48/apps/yast.png Modified: trunk/theme/SLE/icons/16x16/apps/yast-SMT.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/SLE/icons/16x16/apps/yast-… ============================================================================== Binary files - no diff available. Modified: trunk/theme/SLE/icons/22x22/apps/yast-SMT.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/SLE/icons/22x22/apps/yast-… ============================================================================== Binary files - no diff available. Modified: trunk/theme/SLE/icons/22x22/apps/yast.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/SLE/icons/22x22/apps/yast.… ============================================================================== Binary files - no diff available. Modified: trunk/theme/SLE/icons/32x32/apps/yast-SMT.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/SLE/icons/32x32/apps/yast-… ============================================================================== Binary files - no diff available. Modified: trunk/theme/SLE/icons/32x32/apps/yast.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/SLE/icons/32x32/apps/yast.… ============================================================================== Binary files - no diff available. Modified: trunk/theme/SLE/icons/48x48/apps/yast-SMT.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/SLE/icons/48x48/apps/yast-… ============================================================================== Binary files - no diff available. Modified: trunk/theme/SLE/icons/48x48/apps/yast.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/SLE/icons/48x48/apps/yast.… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/16x16/apps/yast-SMT.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/16x16/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/22x22/apps/yast-SMT.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/22x22/apps/yast-SMT.png (original) and trunk/theme/openSUSE/icons/22x22/apps/yast-SMT.png Tue Apr 28 11:58:17 2009 differ Modified: trunk/theme/openSUSE/icons/22x22/apps/yast.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/32x32/apps/yast-SMT.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/32x32/apps/yast-SMT.png (original) and trunk/theme/openSUSE/icons/32x32/apps/yast-SMT.png Tue Apr 28 11:58:17 2009 differ Modified: trunk/theme/openSUSE/icons/32x32/apps/yast.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/48x48/apps/yast-SMT.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/48x48/apps/yast-SMT.png (original) and trunk/theme/openSUSE/icons/48x48/apps/yast-SMT.png Tue Apr 28 11:58:17 2009 differ Modified: trunk/theme/openSUSE/icons/48x48/apps/yast.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Binary files - no diff available. -- 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] r57001 - in /trunk/storage: libstorage/examples/SaveGraph.cc libstorage/src/Graph.cc libstorage/src/Graph.h storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 28 Apr '09

28 Apr '09

Author: aschnell Date: Tue Apr 28 10:23:06 2009 New Revision: 57001 URL: http://svn.opensuse.org/viewcvs/yast?rev=57001&view=rev Log: - style file would be proper solution Modified: trunk/storage/libstorage/examples/SaveGraph.cc trunk/storage/libstorage/src/Graph.cc trunk/storage/libstorage/src/Graph.h trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/libstorage/examples/SaveGraph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Save… ============================================================================== --- trunk/storage/libstorage/examples/SaveGraph.cc (original) +++ trunk/storage/libstorage/examples/SaveGraph.cc Tue Apr 28 10:23:06 2009 @@ -13,7 +13,7 @@ StorageInterface* s = createStorageInterface(true, false, true); - saveGraph(s, "storage.gv", "Helvetica"); + saveGraph(s, "storage.gv"); destroyStorageInterface(s); Modified: trunk/storage/libstorage/src/Graph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Graph.cc?… ============================================================================== --- trunk/storage/libstorage/src/Graph.cc (original) +++ trunk/storage/libstorage/src/Graph.cc Tue Apr 28 10:23:06 2009 @@ -147,7 +147,7 @@ bool - saveGraph(StorageInterface* s, const string& filename, const string& fontname) + saveGraph(StorageInterface* s, const string& filename) { list<Node> nodes; list<Edge> edges; @@ -382,7 +382,7 @@ out << "digraph storage" << endl; out << "{" << endl; - out << " node [shape=rectangle, style=filled, fontname=" << dotQuote(fontname) << "];" << endl; + out << " node [shape=rectangle, style=filled, fontname=\"DejaVu Sans\"];" << endl; out << endl; for (list<Node>::const_iterator node = nodes.begin(); node != nodes.end(); ++node) Modified: trunk/storage/libstorage/src/Graph.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Graph.h?r… ============================================================================== --- trunk/storage/libstorage/src/Graph.h (original) +++ trunk/storage/libstorage/src/Graph.h Tue Apr 28 10:23:06 2009 @@ -22,10 +22,9 @@ * * @param s StorageInterface * @param filename filename of graph - * @param fontname name of font to use * @return true on successful writing of graph */ - bool saveGraph(StorageInterface* s, const string& filename, const string& fontname); + bool saveGraph(StorageInterface* s, const string& filename); } Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Apr 28 10:23:06 2009 @@ -5879,8 +5879,7 @@ global boolean SaveGraph(string filename) { - string fontname = "DejaVu Sans"; - boolean ret = LibStorage::saveGraph(sint, filename, fontname); + boolean ret = LibStorage::saveGraph(sint, filename); y2milestone("SaveGraph filename:%1 ret:%2", filename, ret); return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57000 - in /trunk/bootloader: ./ src/clients/ src/grub/ src/modules/ src/routines/
by juhliarik＠svn.opensuse.org 27 Apr '09

27 Apr '09

Author: juhliarik Date: Mon Apr 27 17:10:59 2009 New Revision: 57000 URL: http://svn.opensuse.org/viewcvs/yast?rev=57000&view=rev Log: updated changes for new module BootStorage.ycp Modified: trunk/bootloader/src/clients/inst_lilo_convert.ycp trunk/bootloader/src/grub/misc.ycp trunk/bootloader/src/grub/options.ycp trunk/bootloader/src/modules/BootGRUB.ycp trunk/bootloader/src/routines/autoinstall.ycp trunk/bootloader/src/routines/i386.ycp trunk/bootloader/src/routines/lilolike.ycp trunk/bootloader/src/routines/misc.ycp trunk/bootloader/yast2-bootloader.spec.in Modified: trunk/bootloader/src/clients/inst_lilo_convert.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/inst_lilo… ============================================================================== --- trunk/bootloader/src/clients/inst_lilo_convert.ycp (original) +++ trunk/bootloader/src/clients/inst_lilo_convert.ycp Mon Apr 27 17:10:59 2009 @@ -20,6 +20,7 @@ import "BootCommon"; +import "BootStorage"; import "Installation"; import "GetInstArgs"; import "Mode"; @@ -61,11 +62,11 @@ BootCommon::InitializeLibrary(true, "grub"); BootCommon::setLoaderType("grub"); - BootCommon::ProposeDeviceMap (); + BootStorage::ProposeDeviceMap (); BootGRUB::Propose(); - BootCommon::SetDeviceMap(BootCommon::device_mapping); + BootCommon::SetDeviceMap(BootStorage::device_mapping); BootCommon::SetSections(sec); BootCommon::SetGlobal(BootCommon::globals); Modified: trunk/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev… ============================================================================== --- trunk/bootloader/src/grub/misc.ycp (original) +++ trunk/bootloader/src/grub/misc.ycp Mon Apr 27 17:10:59 2009 @@ -896,7 +896,7 @@ || (size (BootStorage::device_mapping) == 0) || (BootCommon::cached_settings_base_data_change_time != Storage::GetTargetChangeTime())) { - BootCommon::ProposeDeviceMap(); + BootStorage::ProposeDeviceMap(); } if ( ! Mode::autoinst () ) { Modified: trunk/bootloader/src/grub/options.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/options.ycp?… ============================================================================== --- trunk/bootloader/src/grub/options.ycp (original) +++ trunk/bootloader/src/grub/options.ycp Mon Apr 27 17:10:59 2009 @@ -19,6 +19,7 @@ textdomain "bootloader"; import "Label"; +import "BootStorage"; import "System::Bootloader_API"; include "bootloader/routines/common_options.ycp"; @@ -299,7 +300,7 @@ void InitDiskOrder(string widget) { - list<string> disksOrder = BootCommon::DisksOrder (); + list<string> disksOrder = BootStorage::DisksOrder (); UI::ChangeWidget ( `id(`disks), `Items, disksOrder); UI::ChangeWidget (`id (`disks), `CurrentItem, disksOrder[0]:""); Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.… ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Mon Apr 27 17:10:59 2009 @@ -494,7 +494,7 @@ if (BootStorage::device_mapping == nil || size (BootStorage::device_mapping) == 0) { - BootCommon::ProposeDeviceMap (); + BootStorage::ProposeDeviceMap (); } //importMetaData(); Modified: trunk/bootloader/src/routines/autoinstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/autoinst… ============================================================================== --- trunk/bootloader/src/routines/autoinstall.ycp (original) +++ trunk/bootloader/src/routines/autoinstall.ycp Mon Apr 27 17:10:59 2009 @@ -103,6 +103,7 @@ // ------------------------------------------------- import "Bootloader"; + import "BootStorage"; import "BootCommon"; import "Initrd"; import "Kernel"; @@ -395,7 +396,7 @@ }); string file = mergestring (lines, "\n"); BootCommon::InitializeLibrary (true, loader); - BootCommon::SetDeviceMap (BootCommon::device_mapping); + BootCommon::SetDeviceMap (BootStorage::device_mapping); BootCommon::SetSections ([]); BootCommon::SetGlobal ($[]); map<string,string> files = BootCommon::GetFilesContents (); Modified: trunk/bootloader/src/routines/i386.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/i386.ycp… ============================================================================== --- trunk/bootloader/src/routines/i386.ycp (original) +++ trunk/bootloader/src/routines/i386.ycp Mon Apr 27 17:10:59 2009 @@ -169,7 +169,7 @@ || size (BootStorage::device_mapping) == 0) && (getLoaderType(false) == "grub")) { - ProposeDeviceMap (); + BootStorage::ProposeDeviceMap (); } if (DisksChanged () && ! Mode::autoinst ()) { Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike… ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Mon Apr 27 17:10:59 2009 @@ -27,9 +27,7 @@ import "Map"; global string DiskOrderSummary (); -global list<string> DisksOrder (); global void DetectDisks (); -global void ProposeDeviceMap (); global boolean DisksChanged (); include "bootloader/routines/i386.ycp"; @@ -73,7 +71,7 @@ */ global string FindMBRDisk() { // check the disks order, first has MBR - list<string> order = DisksOrder (); + list<string> order = BootStorage::DisksOrder (); if (size (order) > 0) { string ret = order[0]:""; @@ -1080,7 +1078,7 @@ * @return string a line for the summary (or nil if not intended to be shown) */ global string DiskOrderSummary () { - list<string> order = DisksOrder (); + list<string> order = BootStorage::DisksOrder (); string ret = nil; if (size (order) > 1) { Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp… ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Mon Apr 27 17:10:59 2009 @@ -404,7 +404,7 @@ // examineMBR returns "* stage1" when it finds the signature // of some stage1 bootloader string result = examineMBR(device); - if ((search(result, "grub") != nil) || (search(result, "lilo") != nil)) + if ((result == "grub") || (result == "lilo")) return true; else return false; Modified: trunk/bootloader/yast2-bootloader.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/yast2-bootloader.spec… ============================================================================== --- trunk/bootloader/yast2-bootloader.spec.in (original) +++ trunk/bootloader/yast2-bootloader.spec.in Mon Apr 27 17:10:59 2009 @@ -10,7 +10,7 @@ Requires: yast2-packager >= 2.17.24 Requires: yast2-pkg-bindings >= 2.17.25 Requires: perl-Bootloader >= 0.5.0 -Requires: yast2-core >= 2.18.6 +Requires: yast2-core >= 2.18.7 Requires: yast2-storage parted perl-Compress-Zlib limal-perl BuildRequires: yast2 >= 2.18.14 BuildRequires: yast2-packager >= 2.17.24 -- 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] r56999 - in /trunk/devtools: devtools/bin/oscsubmit package/yast2-devtools.changes
by jsrain＠svn.opensuse.org 27 Apr '09

27 Apr '09

Author: jsrain Date: Mon Apr 27 16:40:17 2009 New Revision: 56999 URL: http://svn.opensuse.org/viewcvs/yast?rev=56999&view=rev Log: make oscsubmit work correctly with cmake-based modules Modified: trunk/devtools/devtools/bin/oscsubmit trunk/devtools/package/yast2-devtools.changes Modified: trunk/devtools/devtools/bin/oscsubmit URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/oscsubmit?… ============================================================================== --- trunk/devtools/devtools/bin/oscsubmit (original) +++ trunk/devtools/devtools/bin/oscsubmit Mon Apr 27 16:40:17 2009 @@ -38,6 +38,7 @@ echo "" >>$LOGFILE; rm $OBS_PROJECT/$PACKAGE/* 2>&1 | tee -a $LOGFILE +cp build/package/* $OBS_PROJECT/$PACKAGE # needed for cmake-based modules cp package/* $OBS_PROJECT/$PACKAGE echo "OK" | tee -a $LOGFILE diff $OBS_PROJECT/$PACKAGE/*changes $OBS_PROJECT/$PACKAGE/.osc/*changes >diff Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Mon Apr 27 16:40:17 2009 @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Mon Apr 27 15:31:41 CEST 2009 - jsrain(a)suse.cz +Mon Apr 27 16:39:40 CEST 2009 - jsrain(a)suse.cz - fixed y2tool oscsubmit when submitting package the first time +- make oscsubmit work correctly with cmake-based modules ------------------------------------------------------------------- Mon Apr 27 14:19:14 CEST 2009 - jsrain(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] r56998 - /tags/stable-2_18_9/core/
by mvidner＠svn.opensuse.org 27 Apr '09

27 Apr '09

Author: mvidner Date: Mon Apr 27 16:08:46 2009 New Revision: 56998 URL: http://svn.opensuse.org/viewcvs/yast?rev=56998&view=rev Log: Created tag stable-2_18_9 for core Added: tags/stable-2_18_9/core/ (props changed) - copied from r56997, trunk/core/ -- 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] r56997 - in /trunk/core: VERSION liby2/src/genericfrontend.cc package/yast2-core.changes
by mvidner＠svn.opensuse.org 27 Apr '09

27 Apr '09

Author: mvidner Date: Mon Apr 27 15:51:48 2009 New Revision: 56997 URL: http://svn.opensuse.org/viewcvs/yast?rev=56997&view=rev Log: Resurrected logging in the signal handler, into /var/log/YaST2/signal (or ./y2signal.log) (bnc#493152#c33). Modified: trunk/core/VERSION trunk/core/liby2/src/genericfrontend.cc trunk/core/package/yast2-core.changes Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=56997&r1=56996&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Mon Apr 27 15:51:48 2009 @@ -1 +1 @@ -2.18.8 +2.18.9 Modified: trunk/core/liby2/src/genericfrontend.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2/src/genericfrontend.c… ============================================================================== --- trunk/core/liby2/src/genericfrontend.cc (original) +++ trunk/core/liby2/src/genericfrontend.cc Mon Apr 27 15:51:48 2009 @@ -89,9 +89,9 @@ #include <execinfo.h> #include <stdio.h> #include <stdlib.h> +#include <errno.h> #include <sstream> #include <iomanip> -#include <cxxabi.h> #include <string> #include <ycp/y2log.h> @@ -123,101 +123,139 @@ static void print_help (); static void print_error (const char*, ...) __attribute__ ((format (printf, 1, 2))); static bool has_parens (const char* arg); -string demangle( const char * mangled ); + +int signal_log_fd; // fd to use for logging in signal handler + +static +void +signal_log_to_fd (int fd, const char * cs) +{ + ssize_t n = strlen (cs); + while (true) { + ssize_t w = write(fd, cs, n); + if (w == n) + break; // success + else if (w == -1) { + if (errno == EINTR) { + // perror("gotcha"); // bnc#470645 + } + else { + perror("write"); // other cases + break; + } + } + else { + errno = 0; + cs += w; + n -= w; + } + } + +} + +static +void +signal_log (const char * cs) +{ + signal_log_to_fd (signal_log_fd, cs); +} static bool -log_blanik (const string & s) +signal_log_ss (const string & s) { - y2lograw (s.c_str ()); + signal_log (s.c_str ()); return true; } + +static +void +signal_log_timestamp () +{ + char buffer[200]; + time_t time_time; + struct tm tm_time; + + time_time = time(NULL); + localtime_r (&time_time, &tm_time); + + if (strftime(buffer, sizeof(buffer), "=== %F %T %z ===\n", &tm_time) != 0) + { + signal_log (buffer); + } +} + // fate#302166 "cache yast debugging logs in case of failure" static -void log_stored_debug () +void signal_log_stored_debug () { - y2error ("Liberating suppressed debugging messages:"); - blanik.for_each (log_blanik); - y2error ("End of suppressed debugging messages"); + signal_log ("Liberating suppressed debugging messages:\n"); + blanik.for_each (signal_log_ss); + signal_log ("End of suppressed debugging messages\n"); } // FATE 302167, info '(libc) Backtraces' void -log_backtrace () +signal_log_backtrace () { static const int N = 100; void *frames[N]; size_t size = backtrace (frames, N); - char ** strings = backtrace_symbols (frames, size); + // demangling is not signal safe + signal_log ("Backtrace: (use c++filt to demangle)\n"); + backtrace_symbols_fd (frames, size, signal_log_fd); +} - std::stringstream backtrace; +void +signal_log_open () +{ + signal_log_fd = -1; + + const char * logfns[] = { + "/var/log/YaST2/signal", + "y2signal.log", + NULL, // sentinel + }; - for (size_t i = 0; i < size; ++i) + for (const char ** logfn_p = &logfns[0]; *logfn_p != NULL; ++logfn_p) { - backtrace << " Frame " - << std::setw( 2 ) << i << ": " - << demangle( strings[i] ) << "\n"; + signal_log_fd = open (*logfn_p, O_WRONLY | O_CREAT | O_APPEND, 0700); + if (signal_log_fd != -1) + break; } - - y2error( "Back trace:\n\n%s\n== End of back trace ===\n", - backtrace.str().c_str() ); - - free (strings); } - - -string demangle( const char * mangled ) +void +signal_handler (int sig) { - const char * func_begin = strchr( mangled, '(' ); - - if ( ! func_begin ) - return string( mangled ); - - func_begin++; // skip '(' - - string func( func_begin ); - std::size_t func_end = func.find_first_of( ")+" ); - - if ( func_end != string::npos ) - func.erase( func_end ); + signal (sig, SIG_IGN); - int status = 0; - char * demangled_name = - abi::__cxa_demangle( func.c_str(), - 0, // output buffer - 0, // length - & status ); + // bnc#493152#c19 only signal-safe functions are allowed + char buffer[200]; + int n = snprintf (buffer, sizeof(buffer), + "YaST got signal %d at YCP file %s:%d\n", + sig, ee.filename ().c_str (), ee.linenumber ()); + if (n >= (int)sizeof(buffer) || n < 0) + strcpy (buffer, "YaST got a signal.\n"); + signal_log_to_fd (STDERR_FILENO, buffer); - if ( status == 0 && demangled_name ) + signal_log_open (); + if (signal_log_fd == -1) { - func = string( demangled_name ); - free( demangled_name ); // abi::__cxa_demangle uses malloc() - - string lib_name = string( mangled, func_begin - mangled -1 ); - - return lib_name + " " + func; + signal_log_to_fd (STDERR_FILENO, "Could not open log file.\n"); } else { - return string( mangled ); - } -} + signal_log_timestamp (); + signal_log (buffer); + signal_log_stored_debug (); + signal_log_backtrace (); + if (close (signal_log_fd) == -1) + perror ("log close"); + } -void -signal_handler (int sig) -{ - signal (sig, SIG_IGN); -/* // bnc#493152#c19 only signal-safe functions are allowed - fprintf (stderr, "YaST got signal %d at YCP file %s:%d\n", - sig, ee.filename ().c_str (), ee.linenumber ()); - y2error ("got signal %d at YCP file %s:%d", - sig, ee.filename ().c_str (), ee.linenumber ()); - log_stored_debug (); - log_backtrace (); -*/ // bye signal (sig, SIG_DFL); kill ( getpid (), sig); Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Mon Apr 27 15:51:48 2009 @@ -1,7 +1,10 @@ ------------------------------------------------------------------- -Mon Apr 27 13:37:29 CEST 2009 - mvidner(a)suse.cz +Mon Apr 27 15:51:11 CEST 2009 - mvidner(a)suse.cz +- Resurrected logging in the signal handler, into + /var/log/YaST2/signal (or ./y2signal.log) (bnc#493152#c33). - Y2StdioComponent: exit only at EOF, not on parse error (bnc#498407). +- 2.18.9 ------------------------------------------------------------------- Fri Apr 24 13:49:29 CEST 2009 - mvidner(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