Author: lslezak Date: Thu Jan 14 15:53:30 2010 New Revision: 60372 URL: http://svn.opensuse.org/viewcvs/yast?rev=60372&view=rev Log: - copy the correct lircd.conf file to /etc/lircd.conf, check whether the file exists (bnc#492345) - 2.19.1 Modified: trunk/tv/VERSION trunk/tv/package/yast2-tv.changes trunk/tv/src/Tv.ycp Modified: trunk/tv/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/VERSION?rev=60372&r1=60371&r2=60372&view=diff ============================================================================== --- trunk/tv/VERSION (original) +++ trunk/tv/VERSION Thu Jan 14 15:53:30 2010 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/tv/package/yast2-tv.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/package/yast2-tv.changes?rev=60372&r1=60371&r2=60372&view=diff ============================================================================== --- trunk/tv/package/yast2-tv.changes (original) +++ trunk/tv/package/yast2-tv.changes Thu Jan 14 15:53:30 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Thu Jan 14 14:43:01 UTC 2010 - lslezak@suse.cz + +- copy the correct lircd.conf file to /etc/lircd.conf, + check whether the file exists (bnc#492345) +- 2.19.1 + +------------------------------------------------------------------- Wed Jan 13 18:56:03 CET 2010 - kmachalkova@suse.cz - Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su Modified: trunk/tv/src/Tv.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/src/Tv.ycp?rev=60372&r1=60371&r2=60372&view=diff ============================================================================== --- trunk/tv/src/Tv.ycp (original) +++ trunk/tv/src/Tv.ycp Thu Jan 14 15:53:30 2010 @@ -30,6 +30,7 @@ import "WizardHW"; import "HWConfig"; import "String"; + import "FileUtils"; textdomain "tv"; @@ -3141,13 +3142,19 @@ irc_module = (SCR::Read(.target.size, "/etc/sysconfig/lirc") >= 0) ? (string) SCR::Read (.sysconfig.lirc.LIRC_MODULE) : ""; if (irc_module == nil) irc_module = ""; - if (SCR::Read (.target.size, "/etc/lircd.conf") != -1) + if (FileUtils::Exists("/etc/lircd.conf")) { irc_config = "/etc/lircd.conf"; } else { - irc_config = "/usr/share/lirc/remotes/linux-input-layer-lircd.conf"; + irc_config = "/usr/share/lirc/remotes/devinput/lircd.conf.devinput"; + + if (!FileUtils::Exists(irc_config)) + { + // error message, %1 is a file name + Report::Error(sformat(_("File %1 is missing,\ncheck your installation."), irc_config)); + } } if (SCR::Read(.target.size, "/usr/share/lirc") >= 0) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org