Mailinglist Archive: opensuse-commit (1083 mails)
| < Previous | Next > |
commit yast2-registration
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sat, 01 Sep 2007 12:52:21 +0200
- Message-id: <20070901105221.D8CA7678180@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-registration
checked in at Sat Sep 1 12:52:21 CEST 2007.
--------
--- yast2-registration/yast2-registration.changes 2007-08-21 21:48:03.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-registration/yast2-registration.changes 2007-09-01 08:39:09.139316000 +0200
@@ -1,0 +2,7 @@
+Sat Sep 1 08:34:49 CEST 2007 - jdsn@xxxxxxx
+
+- adapted source management changes (#304310)
+- wrapping of detailled error messages (#239570)
+- 2.15.2
+
+-------------------------------------------------------------------
Old:
----
yast2-registration-2.15.1.tar.bz2
New:
----
yast2-registration-2.15.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.u25205/_old 2007-09-01 12:50:42.000000000 +0200
+++ /var/tmp/diff_new_pack.u25205/_new 2007-09-01 12:50:42.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-registration (Version 2.15.1)
+# spec file for package yast2-registration (Version 2.15.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-registration
-Version: 2.15.1
+Version: 2.15.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-registration-2.15.1.tar.bz2
+Source0: yast2-registration-2.15.2.tar.bz2
prefix: /usr
Requires: yast2
Requires: yast2-network
@@ -42,7 +42,7 @@
J. Daniel Schmidt <jdsn@xxxxxxx>
%prep
-%setup -n yast2-registration-2.15.1
+%setup -n yast2-registration-2.15.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -92,6 +92,10 @@
/var/adm/fillup-templates/sysconfig.suse_register-yast2-registration
%changelog
+* Sat Sep 01 2007 - jdsn@xxxxxxx
+- adapted source management changes (#304310)
+- wrapping of detailled error messages (#239570)
+- 2.15.2
* Tue Aug 21 2007 - jdsn@xxxxxxx
- handling sysconfig file with fillup (#300064)
- code cleanup - nonroot user not supported
++++++ yast2-registration-2.15.1.tar.bz2 -> yast2-registration-2.15.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.15.1/src/clients/inst_suse_register.ycp new/yast2-registration-2.15.2/src/clients/inst_suse_register.ycp
--- old/yast2-registration-2.15.1/src/clients/inst_suse_register.ycp 2007-08-21 21:40:59.000000000 +0200
+++ new/yast2-registration-2.15.2/src/clients/inst_suse_register.ycp 2007-09-01 04:26:29.000000000 +0200
@@ -30,7 +30,6 @@
import "Internet";
import "Register";
import "SourceManager";
- import "PackageSystem";
import "Package";
// no network - no suse_register
@@ -282,15 +281,26 @@
/* vv CCC ERROR POPUP vv */
term error_message_details=
- `MinSize( 50, 15, `VBox(
+ `MinSize( 60, 20, `VBox(
`Left( `Label( `opt(`boldFont), error_msg ) ),
`VSpacing( 0.5 ),
- `RichText(`id(`errordetail), `opt(`plainText) , "" ),
+ `RichText(`id(`errordetail), "" ),
`PushButton(`id(`ok), Label::OKButton())
));
/* ^^ END CCC ERROR ^^ */
+ /* vv CCC ERROR POPUP PLAINTEXT vv */
+ term error_message_details_pt=
+ `MinSize( 50, 15, `VBox(
+ `Left( `Label( `opt(`boldFont), error_msg ) ),
+ `VSpacing( 0.5 ),
+ `RichText(`id(`errordetail), `opt(`plainText), "" ),
+ `PushButton(`id(`ok), Label::OKButton())
+ ));
+ /* ^^ END CCC ERROR PLAINTEXT ^^ */
+
+
/* vv SUCCESS MESSAGE vv */
term nccc_success=
@@ -339,8 +349,13 @@
if ( retry == `skip ) configure_status = false;
else if (retry == `err_detail)
{
- UI::OpenDialog(error_message_details);
- UI::ChangeWidget( `id(`errordetail), `Value, (string)information_data["stderr"]:"no error message available");
+ // switch to plaintext if error output is one or two lines (#239570)
+ string error_msg_details = (string)information_data["stderr"]:"no error message available";
+ if ( contains( [0,1], size(splitstring(error_msg_details,"\n")) ) )
+ UI::OpenDialog(error_message_details);
+ else
+ UI::OpenDialog(error_message_details_pt);
+ UI::ChangeWidget( `id(`errordetail), `Value, error_msg_details);
UI::UserInput();
UI::CloseDialog();
}
@@ -467,8 +482,12 @@
}
else
{
- // check for and install mozilla-xulrunner if needed (#175166)
- Package::InstallAllMsg(["mozilla-xulrunner181"], nil);
+ // check for and install mozilla-xulrunner if needed (#175166), modified due to (#304310)
+ string required_package = "mozilla-xulrunner181";
+ if (!Package::Installed(required_package))
+ {
+ Package::InstallAllMsg([required_package], nil);
+ }
cmd_ok = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/xulrunner") == 0 ? true:false;
bcmd = " MOZ_DISABLE_PANGO=1 /usr/bin/xulrunner /usr/share/YaST2/yastbrowser/application.ini -url ";
}
@@ -543,11 +562,6 @@
/* -------------------------------- PROGRAM LOGIC START ----------------------------------------------------------- */
- // #172665, make sure that the added sources have a safe home
- // It also takes care of target for keys, shows busy popup
- // (#270899) should be taken care of even during installation
- PackageSystem::EnsureSourceInit ();
-
// #170113, the lock is needed around everything that may end up in ZMD
SourceManager::Lock ();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.15.1/VERSION new/yast2-registration-2.15.2/VERSION
--- old/yast2-registration-2.15.1/VERSION 2007-08-21 21:42:23.000000000 +0200
+++ new/yast2-registration-2.15.2/VERSION 2007-09-01 08:37:16.000000000 +0200
@@ -1 +1 @@
-2.15.1
+2.15.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |