commit yast2-packager

2 Jun 2006

Hello community,

here is the log from the commit of package yast2-packager
checked in at Fri Jun 2 02:15:17 CEST 2006.

--------

--- yast2-packager/yast2-packager.changes	2006-05-30 16:31:26.000000000 +0200
+++ yast2-packager/yast2-packager.changes	2006-06-01 10:15:13.000000000 +0200
@@ -1,0 +2,15 @@
+Thu Jun  1 10:06:00 CEST 2006 - jsrain@suse.cz
+
+- initialize package callbacks earlier to allow install from
+  incorrectly signed installation source (#179567)
+- 2.13.123
+
+-------------------------------------------------------------------
+Wed May 31 09:46:20 CEST 2006 - locilka@suse.cz
+
+- Adding simple editor for viewing and removing "Do Not Show Again"
+  entries from the current configuration.
+- Correcting function that removes these entries inside the
+  DontShowAgain module.
+
+-------------------------------------------------------------------

Old:
----
  yast2-packager-2.13.122.tar.bz2

New:
----
  yast2-packager-2.13.123.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.XjnXrw/_old	2006-06-02 02:13:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XjnXrw/_new	2006-06-02 02:13:25.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-packager (Version 2.13.122)
+# spec file for package yast2-packager (Version 2.13.123)
 #
 # 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.122
+Version:        2.13.123
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-packager-2.13.122.tar.bz2
+Source0:        yast2-packager-2.13.123.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
@@ -43,7 +43,7 @@
     Arvin Schnell <arvin@suse.de>
 
 %prep
-%setup -n yast2-packager-2.13.122
+%setup -n yast2-packager-2.13.123
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -80,6 +80,15 @@
 %doc %{prefix}/share/doc/packages/yast2-packager
 
 %changelog -n yast2-packager
+* Thu Jun 01 2006 - jsrain@suse.cz
+- initialize package callbacks earlier to allow install from
+  incorrectly signed installation source (#179567)
+- 2.13.123
+* Wed May 31 2006 - locilka@suse.cz
+- Adding simple editor for viewing and removing "Do Not Show Again"
+  entries from the current configuration.
+- Correcting function that removes these entries inside the
+  DontShowAgain module.
 * Tue May 30 2006 - jsrain@suse.cz
 - fixed installation into directory (preselect patterns, don't ask
   about base selection if pattern-based installation) (#177917)

++++++ yast2-packager-2.13.122.tar.bz2 -> yast2-packager-2.13.123.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.122/VERSION new/yast2-packager-2.13.123/VERSION
--- old/yast2-packager-2.13.122/VERSION	2006-05-30 16:14:24.000000000 +0200
+++ new/yast2-packager-2.13.123/VERSION	2006-06-01 10:08:57.000000000 +0200
@@ -1 +1 @@
-2.13.122
+2.13.123
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.122/configure new/yast2-packager-2.13.123/configure
--- old/yast2-packager-2.13.122/configure	2006-05-30 16:30:17.000000000 +0200
+++ new/yast2-packager-2.13.123/configure	2006-06-01 10:14:41.000000000 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.122.
+# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.123.
 #
 # Report bugs to <http://bugs.opensuse.org/>.
 #
@@ -269,8 +269,8 @@
 # Identity of this package.
 PACKAGE_NAME='yast2-packager'
 PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.13.122'
-PACKAGE_STRING='yast2-packager 2.13.122'
+PACKAGE_VERSION='2.13.123'
+PACKAGE_STRING='yast2-packager 2.13.123'
 PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
 
 ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures yast2-packager 2.13.122 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.13.123 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -795,7 +795,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of yast2-packager 2.13.122:";;
+     short | recursive ) echo "Configuration of yast2-packager 2.13.123:";;
    esac
   cat <<\_ACEOF
 
@@ -908,7 +908,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-yast2-packager configure 2.13.122
+yast2-packager configure 2.13.123
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by yast2-packager $as_me 2.13.122, which was
+It was created by yast2-packager $as_me 2.13.123, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1652,7 +1652,7 @@
 
 # Define the identity of the package.
  PACKAGE='yast2-packager'
- VERSION='2.13.122'
+ VERSION='2.13.123'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
 
 
 
-VERSION="2.13.122"
+VERSION="2.13.123"
 RPMNAME="yast2-packager"
 MAINTAINER="Jiri Srain <jsrain@suse.cz>"
 
@@ -2695,7 +2695,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by yast2-packager $as_me 2.13.122, which was
+This file was extended by yast2-packager $as_me 2.13.123, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2750,7 +2750,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-yast2-packager config.status 2.13.122
+yast2-packager config.status 2.13.123
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.122/configure.in new/yast2-packager-2.13.123/configure.in
--- old/yast2-packager-2.13.122/configure.in	2006-05-30 16:30:08.000000000 +0200
+++ new/yast2-packager-2.13.123/configure.in	2006-06-01 10:14:25.000000000 +0200
@@ -3,7 +3,7 @@
 dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-packager, 2.13.122, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.13.123, http://bugs.opensuse.org/, 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.122"
+VERSION="2.13.123"
 RPMNAME="yast2-packager"
 MAINTAINER="Jiri Srain <jsrain@suse.cz>"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.122/src/clients/do_not_show_again_editor.ycp new/yast2-packager-2.13.123/src/clients/do_not_show_again_editor.ycp
--- old/yast2-packager-2.13.122/src/clients/do_not_show_again_editor.ycp	1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-packager-2.13.123/src/clients/do_not_show_again_editor.ycp	2006-05-31 12:33:03.000000000 +0200
@@ -0,0 +1,129 @@
+/**
+ * File:    clients/do_not_show_again_editor.ycp
+ * Authors: Lukas Ocilka <locilka@suse.cz>
+ * Summary: Editor for "Do Not Show This Dialog Again" store
+ *
+ * $Id: DontShowAgain.ycp 11111 2006-05-30 12:27:15Z locilka $
+ */
+{
+    import "DontShowAgain";
+    import "Wizard";
+    import "Label";
+    import "Confirm";
+
+    textdomain "packager";
+
+    map <integer, map <string, string> > table_index = $[];
+    
+    void InitTable () {
+	table_index = $[];
+    
+	map <string, map <string, map <string, any> > > current_configuration =
+	    DontShowAgain::GetCurrentConfigurationMap();
+
+	list <term> table_items = [];
+	integer index_counter = 0;
+
+	foreach (string dont_show_type, map <string, map <string, any> > records, current_configuration, {
+	    // DontShowAgain cannot handle other types, there's no functionality for that
+	    if (dont_show_type != "inst-source")
+		continue;
+	    foreach (string popup_type, map <string, any> one_record, records, {
+		foreach (string url, any record_options, one_record, {
+		    // nil records are skipped
+		    if (record_options == nil)
+			continue;
+
+		    index_counter = index_counter + 1;
+		    table_items = add(table_items, 
+			`item(`id(index_counter),
+			    dont_show_type,
+			    popup_type,
+			    url
+			)
+		    );
+		    map <string, string> table_index_item = $[];
+		    table_index_item["q_type"]  = dont_show_type;
+		    table_index_item["q_ident"] = popup_type;
+		    table_index_item["q_url"]   = url;
+		    table_index[index_counter] = table_index_item;
+		});
+	    });
+	});
+	
+	UI::ChangeWidget(`id(`table), `Items, table_items);
+    }
+    
+    void SetDialogContents () {
+	// dialog caption
+	string caption = _("Editor for 'Do Not Show Again'");
+
+	// help text
+	string helptext = _("<p>You can remove entries by selecting them
+in the table and clicking the <b>Delete</b> button.
+The entry will be removed immediately from the current configuration.</p>");
+
+	term contents = `VBox(
+	    `Table(
+		`id(`table),
+		`header(
+		    _("Type"),
+		    _("Popup Ident."),
+		    _("Additional Info")
+		),
+		[]
+	    ),
+	    `HBox (
+		// FIXME: Add filter
+		// `PushButton(`id(`filter), _("&Filter...")),
+		// `HSpacing(2),
+		`PushButton(`id(`delete), _("&Delete"))
+	    )
+	);
+
+	Wizard::SetContentsButtons(caption, contents, helptext,
+	    Label::BackButton(), Label::CloseButton());
+	Wizard::DisableBackButton();
+	Wizard::DisableAbortButton();
+	
+	InitTable();
+    }
+
+    void DeleteItem () {
+	integer delete_item = (integer) UI::QueryWidget(`id(`table), `CurrentItem);
+	if (Confirm::DeleteSelected()) {
+	    map <string, string> delete_params = table_index[delete_item]:nil;
+	    DontShowAgain::RemoveShowQuestionAgain(delete_params);
+	    InitTable();
+	}
+    }
+    
+    any HandleDialog () {
+	any ret = nil;
+
+	while (true) {
+	    ret = UI::UserInput();
+	    
+	    if (ret == `abort || ret == `cancel || ret == `accept || ret == `next) {
+		break;
+	    } else if (ret == `delete) {
+		DeleteItem();
+		continue;
+	    } else {
+		y2error("Undefined return %1", ret);
+		continue;
+	    }
+	}
+
+	return ret;
+    }
+
+    /* ----------------------------------- */
+    Wizard::CreateDialog();
+    SetDialogContents();
+    any ret = HandleDialog();
+    UI::CloseDialog();
+    /* ----------------------------------- */
+
+    return ret;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.122/src/modules/DontShowAgain.ycp new/yast2-packager-2.13.123/src/modules/DontShowAgain.ycp
--- old/yast2-packager-2.13.122/src/modules/DontShowAgain.ycp	2006-05-30 16:29:57.000000000 +0200
+++ new/yast2-packager-2.13.123/src/modules/DontShowAgain.ycp	2006-05-31 12:33:04.000000000 +0200
@@ -75,6 +75,36 @@
     boolean SaveCurrentConfiguration () {
 	LazyLoadCurrentConf();
 
+	// Removing nil entries from the configuration
+	map <string, map <string, map <string, any> > > new_configuration = $[];
+
+	foreach (string dont_show_type, map <string, map <string, any> > records, current_configuration, {
+	    // Defined and known type
+	    if (dont_show_type == "inst-source") {
+		// Every popup type
+		foreach (string popup_type, map <string, any> one_record, records, {
+		    // Every URL
+		    foreach (string url, any record_options, one_record, {
+			// Record mustn't be nil or empty to be reused
+			if (record_options != nil && record_options != $[]) {
+			    // Creating map from the base
+			    if (new_configuration[dont_show_type]:nil == nil)
+				new_configuration[dont_show_type] = $[];
+			    if (new_configuration[dont_show_type, popup_type]:nil == nil)
+				new_configuration[dont_show_type, popup_type] = $[];
+
+			    new_configuration[dont_show_type, popup_type, url] = record_options;
+			}
+		    });
+		});
+	    // Unknown type
+	    } else {
+		new_configuration[dont_show_type] = records;
+	    }
+	});
+
+	current_configuration = new_configuration;
+
 	return SCR::Write(.target.ycp, conf_file, current_configuration);
     }
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.122/src/modules/Packages.ycp new/yast2-packager-2.13.123/src/modules/Packages.ycp
--- old/yast2-packager-2.13.122/src/modules/Packages.ycp	2006-05-30 16:12:59.000000000 +0200
+++ new/yast2-packager-2.13.123/src/modules/Packages.ycp	2006-06-01 10:08:44.000000000 +0200
@@ -3,7 +3,7 @@
  * Package:	Package selections
  * Authors:	Anas Nashif <nashif@suse.de>
  *
- * $Id: Packages.ycp 31191 2006-05-30 14:12:50Z jsrain $
+ * $Id: Packages.ycp 31221 2006-06-01 08:08:41Z jsrain $
  */
 
 {
@@ -528,6 +528,8 @@
 	    return;
 	}
 
+	PackageCallbacksInit::InitPackageCallbacks ();
+
 	//
 	// Initialize package manager
 	//
@@ -645,7 +647,6 @@
 		    AddOnProduct::UpdateInstSys (spdir + "/y2update.tgz");
 		}
 		string sp_url = "dir:" + spdir;
-		PackageCallbacksInit::InitPackageCallbacks ();
 		integer sp_source = Pkg::SourceCreate (sp_url, "");
 		if (sp_source == -1)
 		    Report::Error (_("Failed to integrate service pack source."));


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org

    

commit yast2-packager

root＠suse.de