Hello community,
here is the log from the commit of package yast2-packager
checked in at Thu Apr 6 16:47:22 CEST 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-04-05 21:33:54.000000000 +0200
+++ yast2-packager/yast2-packager.changes 2006-04-06 15:58:42.000000000 +0200
@@ -1,0 +2,18 @@
+Thu Apr 6 15:55:45 CEST 2006 - lslezak@suse.cz
+
+- increased minimum free size for update (from 2% to 5%) (#163197)
+- 2.13.68
+
+-------------------------------------------------------------------
+Thu Apr 6 15:21:14 CEST 2006 - visnov@suse.cz
+
+- delete broken sources if they cannot be restored (#157100)
+- 2.13.67
+
+-------------------------------------------------------------------
+Thu Apr 6 15:12:36 CEST 2006 - locilka@suse.cz
+
+- Adding Do_not_show_this_dialog_again functionality into some
+ SignatureCheckDialogs.
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.13.65.tar.bz2
New:
----
yast2-packager-2.13.68.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.hiCelb/_old 2006-04-06 16:43:13.000000000 +0200
+++ /var/tmp/diff_new_pack.hiCelb/_new 2006-04-06 16:43:13.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.65)
+# spec file for package yast2-packager (Version 2.13.68)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-packager
-Version: 2.13.65
+Version: 2.13.68
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.65.tar.bz2
+Source0: yast2-packager-2.13.68.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml
Requires: yast2 yast2-installation checkmedia yast2-country
@@ -41,7 +41,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.13.65
+%setup -n yast2-packager-2.13.68
%build
%{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,15 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Thu Apr 06 2006 - lslezak@suse.cz
+- increased minimum free size for update (from 2%% to 5%%) (#163197)
+- 2.13.68
+* Thu Apr 06 2006 - visnov@suse.cz
+- delete broken sources if they cannot be restored (#157100)
+- 2.13.67
+* Thu Apr 06 2006 - locilka@suse.cz
+- Adding Do_not_show_this_dialog_again functionality into some
+ SignatureCheckDialogs.
* Wed Apr 05 2006 - jsrain@suse.de
- call Pkg::PkgFreshen in proposal (#156980)
- 2.13.65
++++++ yast2-packager-2.13.65.tar.bz2 -> yast2-packager-2.13.68.tar.bz2 ++++++
++++ 2828 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.65/VERSION new/yast2-packager-2.13.68/VERSION
--- old/yast2-packager-2.13.65/VERSION 2006-04-05 21:30:34.000000000 +0200
+++ new/yast2-packager-2.13.68/VERSION 2006-04-06 15:58:45.000000000 +0200
@@ -1 +1 @@
-2.13.65
+2.13.68
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.65/configure.in new/yast2-packager-2.13.68/configure.in
--- old/yast2-packager-2.13.65/configure.in 2006-04-05 21:34:09.000000000 +0200
+++ new/yast2-packager-2.13.68/configure.in 2006-03-06 14:16:53.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.13.65, http://www.suse.de/feedback, yast2-packager)
+AC_INIT(yast2-packager, 2.13.39, http://www.suse.de/feedback, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.65"
+VERSION="2.13.39"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.65/src/clients/inst_source.ycp new/yast2-packager-2.13.68/src/clients/inst_source.ycp
--- old/yast2-packager-2.13.65/src/clients/inst_source.ycp 2006-04-05 19:11:37.000000000 +0200
+++ new/yast2-packager-2.13.68/src/clients/inst_source.ycp 2006-04-06 15:58:29.000000000 +0200
@@ -350,6 +350,9 @@
Popup::Error(_("There were errors when restoring the source configuration.
Not all sources will be available for configuration.
") + "\n" + Pkg::LastError() );
+
+ // delete the broken sources from the persistent store
+ Pkg::SourceCleanupBroken();
}
sourceStatesIn = Pkg::SourceEditGet();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.65/src/modules/SignatureCheckCallbacks.ycp new/yast2-packager-2.13.68/src/modules/SignatureCheckCallbacks.ycp
--- old/yast2-packager-2.13.65/src/modules/SignatureCheckCallbacks.ycp 2006-04-05 19:11:37.000000000 +0200
+++ new/yast2-packager-2.13.68/src/modules/SignatureCheckCallbacks.ycp 2006-04-06 15:58:29.000000000 +0200
@@ -24,9 +24,19 @@
//
// zypp: askUserToAcceptUnsignedFile
//
+ // (+DontShowAgain functionality) -- for one run in memory
+ //
/* function for CallbackAcceptUnsignedFile() */
global boolean AcceptUnsignedFile (string filename) {
- return SignatureCheckDialogs::UseUnsignedItem(`file, filename);
+ string dont_show_dialog_ident = "-AcceptUnsignedFile-";
+
+ // Show the popup?
+ if (SignatureCheckDialogs::GetShowThisPopup(dont_show_dialog_ident)) {
+ return SignatureCheckDialogs::UseUnsignedItem(`file, filename, dont_show_dialog_ident);
+ // Return the default value entered by user
+ } else {
+ return SignatureCheckDialogs::GetDefaultDialogReturn(dont_show_dialog_ident);
+ }
}
@@ -37,10 +47,20 @@
//
// zypp: askUserToAcceptUnknownKey
//
+ // (+DontShowAgain functionality) -- for one run in memory
+ //
/* function for CallbackAcceptUnknownGpgKey() */
global boolean AcceptUnknownGpgKey (string filename, string keyid, string keyname) {
- // Unknown keyname == "Unknown Key"
- return SignatureCheckDialogs::ItemSignedWithUnknownSignature(`file, filename, keyid);
+ string dont_show_dialog_ident = "-AcceptUnknownGpgKey-";
+
+ // Show the popup?
+ if (SignatureCheckDialogs::GetShowThisPopup(dont_show_dialog_ident)) {
+ // Unknown keyname == "Unknown Key"
+ return SignatureCheckDialogs::ItemSignedWithUnknownSignature(`file, filename, keyid, dont_show_dialog_ident);
+ // Return the default value entered by user
+ } else {
+ return SignatureCheckDialogs::GetDefaultDialogReturn(dont_show_dialog_ident);
+ }
}
// Name of the callback handler function. Required callback prototype is
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.65/src/modules/SignatureCheckDialogs.ycp new/yast2-packager-2.13.68/src/modules/SignatureCheckDialogs.ycp
--- old/yast2-packager-2.13.65/src/modules/SignatureCheckDialogs.ycp 2006-04-05 19:11:37.000000000 +0200
+++ new/yast2-packager-2.13.68/src/modules/SignatureCheckDialogs.ycp 2006-04-06 15:58:29.000000000 +0200
@@ -14,6 +14,100 @@
import "Label";
import "Popup";
+ import "Message";
+
+ /* --------------------------- Don't show this dialog again Magic --------------------------- */
+
+ map show_popup = $[];
+ map popup_ret = $[];
+
+ /**
+ * Functions sets whether user want's to show the dialog again
+ *
+ * @param string popup_type dialog type
+ * @param boolean show again
+ */
+ global void SetShowThisPopup (string popup_type, boolean show_it) {
+ if (popup_type == nil || show_it == nil) {
+ y2error("Neither popup_type %1 nor show_it %2 can be nil!", popup_type, show_it);
+ return;
+ }
+ if (show_it) {
+ y2debug("User decision to show dialog '%1' again is '%2'", popup_type, show_it);
+ } else {
+ y2milestone("User decision to show dialog '%1' again is '%2'", popup_type, show_it);
+ }
+ show_popup[popup_type] = show_it;
+ }
+
+ /**
+ * Function returns whether user want's to show the dialog (again).
+ * true is the default if nothing is set.
+ *
+ * @param string popup_type dialog type
+ * @return boolean show the dialog
+ */
+ global boolean GetShowThisPopup (string popup_type) {
+ if (popup_type == nil) {
+ y2error("popup_type %1 mustn't be nil!", popup_type);
+ return true;
+ }
+ // default (if not defined) is 'true'
+ return show_popup[popup_type]:true;
+ }
+
+ /**
+ * Function sets the default dialog return value
+ * for case when user selected "don't show again"
+ *
+ * @param string popup_type dialog type
+ * @param boolean default_return
+ */
+ global void SetDefaultDialogReturn (string popup_type, boolean default_return) {
+ if (popup_type == nil || default_return == nil) {
+ y2error("Neither popup_type %1 nor default_return %2 can be nil!", popup_type, default_return);
+ return;
+ }
+ y2milestone("User decision in default return for '%1' is '%2'",
+ popup_type, default_return);
+ popup_ret[popup_type] = default_return;
+ }
+
+ /**
+ * Function returns the default popup return value
+ * for case when user selected "don't show again"
+ *
+ * @param string popup_type dialog type
+ * @boolean boolean default dialog return
+ */
+ global boolean GetDefaultDialogReturn (string popup_type) {
+ if (popup_type == nil) {
+ y2error("popup_type %1 mustn't be nil!", popup_type);
+ return false;
+ }
+ y2milestone("User decided not to show popup for '%1' again, returning user-decision '%2'",
+ popup_type, popup_ret[popup_type]:false);
+ return popup_ret[popup_type]:false;
+ }
+
+ void HandleDoNotShowDialogAgain (boolean default_return, string dont_show_dialog_ident, symbol dont_show_dialog_checkboxid) {
+ boolean dont_show_status = (boolean) UI::QueryWidget(`id(dont_show_dialog_checkboxid), `Value);
+ // Widget doesn't exist
+ if (dont_show_status == nil) {
+ y2warning("No such UI widget with ID: %1", dont_show_dialog_checkboxid);
+ // Checkbox selected -> Don't show again
+ } else if (dont_show_status == true) {
+ y2debug("User decision -- don't show the dialog %1 again, setting default return %2",
+ dont_show_dialog_ident, default_return);
+ SetShowThisPopup(dont_show_dialog_ident, false);
+ SetDefaultDialogReturn(dont_show_dialog_ident, default_return);
+ // Checkbox not selected -> Show again
+ } else {
+ SetShowThisPopup(dont_show_dialog_ident, true);
+ }
+ }
+
+ /* --------------------------- Don't show this dialog again Magic --------------------------- */
// Defining icons for dialogs
map msg_icons = $[
@@ -139,9 +233,10 @@
*
* @param symbol item_type `file or `package
* @param string item_name file name or package name
+ * @param string dont_show_dialog_ident for the identification in magic "don't show" functions
* @return boolean use or don't use ('true' if 'yes')
*/
- global boolean UseUnsignedItem (symbol item_type, string item_name) {
+ global boolean UseUnsignedItem (symbol item_type, string item_name, string dont_show_dialog_ident) {
string description_text = sformat((item_type == `package ?
// popup question, %1 stands for the package name
_("The package %1 is not digitally signed. This means that the origin
@@ -168,6 +263,10 @@
`HStretch()
),
`MarginBox(0.5, 0.5, `Label(description_text)),
+ `Left(`MarginBox(0, 1.2, `CheckBox(`id(`dont_show_again),
+ Message::DoNotShowMessageAgain(),
+ (GetShowThisPopup(dont_show_dialog_ident) ? false:true)
+ ))),
YesNoButtons(`no)
)
);
@@ -175,6 +274,9 @@
boolean ret = WaitForYesNoCancelUserInput();
// default value
if (ret == nil) ret = false;
+
+ // Store the don't show value, store the default return value
+ HandleDoNotShowDialogAgain(ret, dont_show_dialog_ident, `dont_show_again);
UI::CloseDialog();
return ret;
@@ -241,9 +343,10 @@
* @param symbol item_type `file or `package
* @param string item_name file name or package name
* @param string key_id
+ * @param string dont_show_dialog_ident for the identification in magic "don't show" functions
* @return boolean true if 'yes, use file'
*/
- global boolean ItemSignedWithUnknownSignature (symbol item_type, string item_name, string key_id) {
+ global boolean ItemSignedWithUnknownSignature (symbol item_type, string item_name, string key_id, string dont_show_dialog_ident) {
string description_text = sformat((item_type == `package ?
// popup question, %1 stands for the package name, %2 for the key ID
_("The package %1 is digitally signed
@@ -276,6 +379,10 @@
`HStretch()
),
`MarginBox(0.5, 0.5, `Label(description_text)),
+ `Left(`MarginBox(0, 1.2, `CheckBox(`id(`dont_show_again),
+ Message::DoNotShowMessageAgain(),
+ (GetShowThisPopup(dont_show_dialog_ident) ? false:true)
+ ))),
YesNoButtons(`no)
)
);
@@ -286,6 +393,9 @@
boolean ret = WaitForYesNoCancelUserInput();
// default value
if (ret == nil) ret = false;
+
+ // Store the don't show value, store the default return value
+ HandleDoNotShowDialogAgain(ret, dont_show_dialog_ident, `dont_show_again);
UI::CloseDialog();
return ret;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.65/src/modules/SpaceCalculation.ycp new/yast2-packager-2.13.68/src/modules/SpaceCalculation.ycp
--- old/yast2-packager-2.13.65/src/modules/SpaceCalculation.ycp 2006-03-29 18:29:14.000000000 +0200
+++ new/yast2-packager-2.13.68/src/modules/SpaceCalculation.ycp 2006-04-06 15:57:44.000000000 +0200
@@ -10,7 +10,7 @@
* on Installation::sourcedir
*
*
- * $Id: SpaceCalculation.ycp 29218 2006-03-21 13:33:56Z lslezak $
+ * $Id: SpaceCalculation.ycp 29803 2006-04-06 13:54:16Z lslezak $
*/
{
@@ -357,7 +357,7 @@
}
else if ( Mode::update () )
{
- partition = EvaluateFreeSpace ( 2 ); // 2% free spare for update/upgrade
+ partition = EvaluateFreeSpace ( 5 ); // 5% free spare for update/upgrade
}
else if ( Mode::normal () )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.65/src/modules/test.ycp new/yast2-packager-2.13.68/src/modules/test.ycp
--- old/yast2-packager-2.13.65/src/modules/test.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-packager-2.13.68/src/modules/test.ycp 2005-11-02 13:29:02.000000000 +0100
@@ -0,0 +1,58 @@
+
+{
+ import "Package";
+ import "CommandLine";
+
+ textdomain "test";
+
+ boolean startHandler(map opts) {
+ Package::InstallAll(["samba-doc", "qt3-devel-doc"]);
+// Package::InstallAll(["sambadocdfdfdf"]);
+
+ return true;
+ }
+
+ symbol GUIhandler() {
+ y2milestone("GUIhandler");
+ return `next;
+ }
+
+ boolean Read() {
+ return true;
+ }
+
+ boolean Write() {
+ return true;
+ }
+
+ map cmdline = $[
+ // help text
+ "help" : _("Start installation in a virtual machine"),
+ "id" : "vm",
+ "guihandler": GUIhandler,
+ "initialize": Read,
+ "finish" : Write,
+ "actions" : $[
+ "start" : $[
+ // command description
+ "help" : _("Start installation"),
+ "handler" : startHandler
+ ]
+ ],
+ "options" : $[
+ "configured" : $[
+ // option description
+ "help" : _("List only configured devices")
+ ],
+ "all" : $[
+ // option description
+ "help" : _("List all detected IDE devices")
+ ]
+ ],
+ "mappings" : $[
+ "start" : ["configured", "all"],
+ ]
+ ];
+
+ any ret = CommandLine::Run(cmdline);
+}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...