Mailinglist Archive: yast-commit (723 mails)

< Previous Next >
[yast-commit] r47256 - in /trunk/packager: VERSION package/yast2-packager.changes src/clients/repositories.ycp
  • From: lslezak@xxxxxxxxxxxxxxxx
  • Date: Fri, 02 May 2008 15:40:45 -0000
  • Message-id: <20080502154045.42C7B264F0@xxxxxxxxxxxxxxxx>
Author: lslezak
Date: Fri May 2 17:40:44 2008
New Revision: 47256

URL: http://svn.opensuse.org/viewcvs/yast?rev=47256&view=rev
Log:
- repositories.ycp - do not disable Progress:: when started from
sw_single (bnc#381673)
- fixed command line mode init
- 2.16.44

Modified:
trunk/packager/VERSION
trunk/packager/package/yast2-packager.changes
trunk/packager/src/clients/repositories.ycp

Modified: trunk/packager/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=47256&r1=47255&r2=47256&view=diff
==============================================================================
--- trunk/packager/VERSION (original)
+++ trunk/packager/VERSION Fri May 2 17:40:44 2008
@@ -1 +1 @@
-2.16.43
+2.16.44

Modified: trunk/packager/package/yast2-packager.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=47256&r1=47255&r2=47256&view=diff
==============================================================================
--- trunk/packager/package/yast2-packager.changes (original)
+++ trunk/packager/package/yast2-packager.changes Fri May 2 17:40:44 2008
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Fri May 2 17:38:32 CEST 2008 - lslezak@xxxxxxx
+
+- repositories.ycp - do not disable Progress:: when started from
+ sw_single (bnc#381673)
+- fixed command line mode init
+- 2.16.44
+
+-------------------------------------------------------------------
Wed Apr 30 15:23:38 CEST 2008 - lslezak@xxxxxxx

- don't show "Repository" menu in the package manager during

Modified: trunk/packager/src/clients/repositories.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositories.ycp?rev=47256&r1=47255&r2=47256&view=diff
==============================================================================
--- trunk/packager/src/clients/repositories.ycp (original)
+++ trunk/packager/src/clients/repositories.ycp Fri May 2 17:40:44 2008
@@ -41,7 +41,10 @@

boolean full_mode = false;

- boolean textmode = UI::GetDisplayInfo()["TextMode"]:false;
+ boolean textmode()
+ {
+ return Mode::commandline() ? true :
UI::GetDisplayInfo()["TextMode"]:false;
+ }

integer numSources = 0;

@@ -204,7 +207,7 @@

term repoInfoTerm(string name, string url, string category)
{
- return textmode ?
+ return textmode() ?
`VBox (
`Left(`Heading(`id(`name), `opt(`hstretch), name)),
`Left(`Label(`id(`url), `opt(`hstretch), url)),
@@ -226,7 +229,7 @@
// label, %1 is repo category (eg. YUM)
string category = sformat (_("Category: %1"),
info["type"]:_("Unknown"));

- if (textmode)
+ if (textmode())
{
UI::ChangeWidget(`id(`name), `Label, name);
UI::ChangeWidget(`id(`url), `Label, url);
@@ -907,7 +910,8 @@
if (to_refresh > 0)
{
Wizard::CreateDialog ();
- Progress::New("Refreshing Repositories", "", to_refresh +
1, [ "Refresh Repositories" ], [], "TODO HELP");
+ // TODO: add help text
+ Progress::New(_("Refreshing Repositories"), "", to_refresh
+ 1, [ _("Refresh Repositories") ], [], "");

foreach(map<string,any> src_state, sourceStatesOut,
{
@@ -1219,18 +1223,26 @@
y2internal("Started from sw_single, switching the mode");

full_mode = true;
- boolean progress_state = Progress::set(false);
any ret = StartInstSource();

// load objects from the new repositories
- Pkg::SourceLoad();
- Progress::set(progress_state);
+ if (ret != `abort)
+ {
+ Pkg::SourceLoad();
+ }

return ret;
}
else
{
y2milestone("Initializing the target...");
+
+ // disable callbasks in command line mode
+ if (size(WFM::Args()) > 0)
+ {
+ Mode::SetUI ("commandline");
+ }
+
Pkg::TargetInit("/", true);
}


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

< Previous Next >
This Thread
  • No further messages