Mailinglist Archive: yast-commit (535 mails)

< Previous Next >
[yast-commit] r41247 - /trunk/ntp-client/src/ntp-client_proposal.ycp
  • From: kmachalkova@xxxxxxxxxxxxxxxx
  • Date: Wed, 03 Oct 2007 16:40:22 -0000
  • Message-id: <20071003164023.1F9DB2FC9B@xxxxxxxxxxxxxxxx>
Author: kmachalkova
Date: Wed Oct  3 18:40:22 2007
New Revision: 41247

URL: http://svn.opensuse.org/viewcvs/yast?rev=41247&view=rev
Log:
Do not check for availability of xntp package (thus,
update all the repos) if it is already installed 
(#327336 - maybe)

Modified:
    trunk/ntp-client/src/ntp-client_proposal.ycp

Modified: trunk/ntp-client/src/ntp-client_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/ntp-client_proposal.ycp?rev=41247&r1=41246&r2=41247&view=diff
==============================================================================
--- trunk/ntp-client/src/ntp-client_proposal.ycp (original)
+++ trunk/ntp-client/src/ntp-client_proposal.ycp Wed Oct  3 18:40:22 2007
@@ -114,7 +114,12 @@
         }
 
         //does not really work ideally, need something better pkg binding :(
-        if (!Package::Available("xntp"))
+       //Check availability of xntp package
+       //case 1: installation 1st stage - Package::Installed() does not work here
+       //         so let's check for the pkg availability only
+       //case 2: running system - check for pkg availability iff it is not 
+       //        already installed (#328469)
+        if ( ( Stage::initial() || !Package::Installed("xntp") ) && !Package::Available("xntp") )
         {
             y2warning("xntp package is not installable, NTP synchronization will not be available");
             UI::ChangeWidget(`id(`ntp_content), `Enabled, false);
@@ -175,8 +180,8 @@
        Packages::addAdditionalPackage("yast2-ntp-client");
 
         integer r = (integer) SCR::Execute (.target.bash, sformat ("/usr/sbin/ntpdate '%1'", String::Quote(ntp_server)));
-       Popup::ClearFeedback();
         y2milestone ("'ntpdate %1' returned %2", ntp_server, r);
+       Popup::ClearFeedback();
 
         if( !Stage::initial())
         {

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages