Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit yast2-packager
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Sat, 25 Aug 2007 00:45:28 +0200
  • Message-id: <20070824224529.3EB3F678331@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-packager
checked in at Sat Aug 25 00:45:28 CEST 2007.

--------
--- yast2-packager/yast2-packager.changes       2007-08-16 13:43:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes  2007-08-24 16:23:10.000000000 +0200
@@ -1,0 +2,43 @@
+Fri Aug 24 16:21:26 CEST 2007 - locilka@xxxxxxx
+
+- Fixed "If you like to print this license..." by moving it to the
+  correct place (#304334).
+- 2.15.68
+
+-------------------------------------------------------------------
+Fri Aug 24 15:12:19 CEST 2007 - locilka@xxxxxxx
+
+- Disable the [ Next ] button in the License dialog until either
+  "Agree" or "Dont't Agree" is selected (#303828).
+- 2.15.67
+
+-------------------------------------------------------------------
+Thu Aug 23 18:31:31 CEST 2007 - locilka@xxxxxxx
+
+- Displaying license in a separate Wizard dialog not to rewrite the
+  progress or other dialogs below (#303922).
+
+-------------------------------------------------------------------
+Thu Aug 23 16:35:51 CEST 2007 - sh@xxxxxxx
+
+- Beautification for bug #299787: Preserve spacings even with
+  over-long repo names
+- 2.15.66 
+
+-------------------------------------------------------------------
+Wed Aug 22 16:22:21 CEST 2007 - lslezak@xxxxxxx
+
+- better error handling when adding Online Repositories (#302385)
+- disable [Back] button in the check media module (#300208)
+- 2.15.65
+
+-------------------------------------------------------------------
+Wed Aug 22 10:27:15 CEST 2007 - locilka@xxxxxxx
+
+- Make possible to abort in the the Read/Write dialog of Online
+  Repositories (#298050).
+- [ Back ] [ Cancel ] [ Accept ] buttons in Software Selection
+  dialog (#298056).
+- 2.15.64
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.yT6745/_old  2007-08-25 00:43:29.000000000 +0200
+++ /var/tmp/diff_new_pack.yT6745/_new  2007-08-25 00:43:29.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-packager (Version 2.15.63)
+# spec file for package yast2-packager (Version 2.15.68)
 #
 # 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-packager
-Version:        2.15.63
+Version:        2.15.68
 Release:        1
 License:        GPL v2 or later
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-packager-2.15.63.tar.bz2
+Source0:        yast2-packager-2.15.68.tar.bz2
 prefix:                /usr
 BuildRequires:  docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml
 BuildRequires:  yast2 >= 2.15.38
@@ -55,7 +55,7 @@
     Arvin Schnell <arvin@xxxxxxx>
 
 %prep
-%setup -n yast2-packager-2.15.63
+%setup -n yast2-packager-2.15.68
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -96,6 +96,31 @@
 %doc %{prefix}/share/doc/packages/yast2-packager
 
 %changelog
+* Fri Aug 24 2007 - locilka@xxxxxxx
+- Fixed "If you like to print this license..." by moving it to the
+  correct place (#304334).
+- 2.15.68
+* Fri Aug 24 2007 - locilka@xxxxxxx
+- Disable the [ Next ] button in the License dialog until either
+  "Agree" or "Dont't Agree" is selected (#303828).
+- 2.15.67
+* Thu Aug 23 2007 - locilka@xxxxxxx
+- Displaying license in a separate Wizard dialog not to rewrite the
+  progress or other dialogs below (#303922).
+* Thu Aug 23 2007 - sh@xxxxxxx
+- Beautification for bug #299787: Preserve spacings even with
+  over-long repo names
+- 2.15.66
+* Wed Aug 22 2007 - lslezak@xxxxxxx
+- better error handling when adding Online Repositories (#302385)
+- disable [Back] button in the check media module (#300208)
+- 2.15.65
+* Wed Aug 22 2007 - locilka@xxxxxxx
+- Make possible to abort in the the Read/Write dialog of Online
+  Repositories (#298050).
+- [ Back ] [ Cancel ] [ Accept ] buttons in Software Selection
+  dialog (#298056).
+- 2.15.64
 * Thu Aug 16 2007 - jsuchome@xxxxxxx
 - inst_source.ycp renamed to repositories.ycp  (#300923)
 - fixed double-click in the sources table

++++++ yast2-packager-2.15.63.tar.bz2 -> yast2-packager-2.15.68.tar.bz2 ++++++
++++ 4896 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.15.63/configure.in new/yast2-packager-2.15.68/configure.in
--- old/yast2-packager-2.15.63/configure.in     2007-08-14 11:13:44.000000000 +0200
+++ new/yast2-packager-2.15.68/configure.in     2007-08-23 17:10:58.000000000 +0200
@@ -1,9 +1,9 @@
 dnl configure.in for yast2-packager
 dnl
-dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-packager, 2.15.60, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.15.66, 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.15.60"
+VERSION="2.15.66"
 RPMNAME="yast2-packager"
 MAINTAINER="Ladislav Slezak <lslezak@xxxxxxx>"
 
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.15.63/Makefile.am new/yast2-packager-2.15.68/Makefile.am
--- old/yast2-packager-2.15.63/Makefile.am      2007-08-14 11:13:44.000000000 +0200
+++ new/yast2-packager-2.15.68/Makefile.am      2007-08-23 17:10:58.000000000 +0200
@@ -210,8 +210,7 @@
 
 # For po/ modules
 checkpo:
-       test ! -d $(srcdir)/po || $(MAKE) -C po checkpo
-#      test ! -d $(srcdir)/po \
-#        || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
+       test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
+#      test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
 # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
 SUBDIRS = agents src testsuite 
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.15.63/src/clients/inst_packages.ycp new/yast2-packager-2.15.68/src/clients/inst_packages.ycp
--- old/yast2-packager-2.15.63/src/clients/inst_packages.ycp    2007-08-14 17:03:16.000000000 +0200
+++ new/yast2-packager-2.15.68/src/clients/inst_packages.ycp    2007-08-22 11:31:10.000000000 +0200
@@ -3,7 +3,7 @@
  * Authors:            Stefan Hundhammer <sh@xxxxxxx>
  * Purpose:             Show the package installation dialog
  *
- * $Id: inst_packages.ycp 39526 2007-07-19 11:46:47Z lslezak $
+ * $Id: inst_packages.ycp 40393 2007-08-22 09:28:49Z locilka $
  *
  */
 
@@ -13,6 +13,7 @@
     import "Mode";
     import "Stage";
     import "Wizard";
+    import "Label";
 
 
     /**
@@ -91,14 +92,21 @@
                 The system needs some available disk space to run properly.
                 </p>");
 
-       Wizard::OpenAcceptDialog();
+       // bugzilla #298056
+       // [ Back ] [ Cancel ] [ Accept ] buttons with [ Back ] disabled
+       Wizard::OpenNextBackDialog();
+       Wizard::SetBackButton  (`back,   Label::BackButton());
+       Wizard::SetAbortButton (`cancel, Label::CancelButton());
+       Wizard::SetNextButton  (`accept, Label::AcceptButton());
+       Wizard::DisableBackButton();
+
        Wizard::SetContents(
                            // Dialog title
                            // Hint for German translation: "Softwareauswahl und Einsatzzweck des Systems"
                            _("Software Selection and System Tasks"),
                            `PatternSelector(`id(`patterns ) ),
                            help_text,
-                           true,       // has_back
+                           false,      // has_back
                            true );     // has_next
 
        Wizard::SetDesktopIcon( "sw_single" );
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.15.63/src/clients/inst_productsources.ycp new/yast2-packager-2.15.68/src/clients/inst_productsources.ycp
--- old/yast2-packager-2.15.63/src/clients/inst_productsources.ycp      2007-08-14 17:07:56.000000000 +0200
+++ new/yast2-packager-2.15.68/src/clients/inst_productsources.ycp      2007-08-23 09:58:37.000000000 +0200
@@ -109,6 +109,35 @@
        return sformat ("(%1|%2)", s_url, s_path);
     }
 
+    // Function returns whether user wants to abort the installation / configuration
+    // true  - abort
+    // false - do not abort
+    //
+    // Bugzilla #298049
+    boolean UserWantsToAbort () {
+       any ret = UI::PollInput();
+
+       if (ret != `abort)
+           return false;
+
+       boolean function_ret = false;
+
+       // `abort pressed
+       if (Stage::initial()) {
+           function_ret = (Popup::ConfirmAbort (`painless));
+       } else {
+           function_ret = (Popup::ContinueCancelHeadline (
+               // TRANSLATORS: popup header
+               _("Aborting Configuration of Online Repository"),
+               // TRANSLATORS: popup question
+               _("Are you sure you want to abort the configuration?")
+           ));
+       }
+
+       y2milestone ("User decided to abort: %1", function_ret);
+       return function_ret;
+    }
+
     boolean NetworkRunning () {
        boolean ret = false;
 
@@ -431,6 +460,8 @@
 
        Progress::NextStage();
 
+       if (UserWantsToAbort()) return `abort;
+
        if (! NetworkRunning()) {
            y2warning ("Cannot proceed, no network configured...");
            // TRANSLATORS: error report
@@ -440,6 +471,8 @@
            return `nosources;
        }
 
+       if (UserWantsToAbort()) return `abort;
+
        // In the installation, recommended repositories will be preselected
        if (Stage::initial()) {
            // Set preselect_recommended to the correct state
@@ -461,6 +494,8 @@
        
        Progress::NextStage();
 
+       if (UserWantsToAbort()) return `abort;
+
        // language used for possible translations
        if (! Stage::initial())
            language_long = GetCurrentLang ();
@@ -472,6 +507,8 @@
        language_short = substring (language_long, 0, 2);
        y2milestone ("Preferred language: %1 %2", language_long, language_short);
 
+       if (UserWantsToAbort()) return `abort;
+
        if (! ReadControlFile()) {
            y2milestone ("Feature not supported by the product");
            // TRANSLATORS: light-warning message
@@ -480,6 +517,8 @@
 
            return `nosources;
        }
+
+       if (UserWantsToAbort()) return `abort;
        
        if (! DownloadAndParseSources()) {
            y2error ("Cannot download or parse repositories");
@@ -490,10 +529,14 @@
            return `nosources;
        }
 
+       if (UserWantsToAbort()) return `abort;
+
        if (! Stage::initial()) {
            Progress::NextStage();
            InitializeSources();
        }
+
+       if (UserWantsToAbort()) return `abort;
        
        Progress::Finish();
        sleep (600);
@@ -944,13 +987,23 @@
     }
 
     boolean CreateSource (string url, string pth, string repo_name) {
-       integer src_id = Pkg::RepositoryAdd ($[
-           "enabled" : false,
-           "name" : repo_name,
-           "base_urls" : [url],
-           "prod_dir" : pth,
-           "alias" : url,
-       ]);
+       integer src_id = nil;
+
+       string repo_type = Pkg::RepositoryProbe(url, pth);
+       y2milestone("Probed repository type: %1", repo_type);
+
+       // probing succeeded?
+       if (repo_type != nil && repo_type != "NONE")
+       {
+           src_id = Pkg::RepositoryAdd ($[
+               "enabled" : false,
+               "name" : repo_name,
+               "base_urls" : [url],
+               "prod_dir" : pth,
+               "alias" : url,
+               "type" : repo_type,
+           ]);
+       }
 
        if (src_id == nil) {
            Report::Error (sformat (
@@ -1071,6 +1124,8 @@
        );
        Wizard::SetTitleIcon ("yast-sw_source");
 
+       if (UserWantsToAbort()) return `abort;
+
        if (repos_to_be_deleted != []) {
            Progress::NextStage();
            foreach (integer src_id, repos_to_be_deleted, {
@@ -1085,12 +1140,17 @@
            });
        }
 
+       if (UserWantsToAbort()) return `abort;
+
        // One progress stage for all repositories
        if (at_once) Progress::NextStage();
 
        foreach (string repo_id, repos_to_be_used, {
            // If not at once, call one stage per repository
            if (! at_once) Progress::NextStage();
+
+           if (UserWantsToAbort()) return `abort;
+
            CreateSource (
                list_of_repos[repo_id, "url"]:"",
                list_of_repos[repo_id, "path"]:"/",
@@ -1098,6 +1158,8 @@
            );
        });
 
+       if (UserWantsToAbort()) return `abort;
+
        // Redraw installation wizard
        if (Stage::initial()) {
            UpdateWizardSteps();
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.15.63/src/clients/repositories.ycp new/yast2-packager-2.15.68/src/clients/repositories.ycp
--- old/yast2-packager-2.15.63/src/clients/repositories.ycp     2007-08-16 13:26:43.000000000 +0200
+++ new/yast2-packager-2.15.68/src/clients/repositories.ycp     2007-08-23 16:48:40.000000000 +0200
@@ -6,7 +6,7 @@
  * Purpose:
  * Adding, removing and prioritizing of repositories for packagemanager.
  *
- * $Id: repositories.ycp 40312 2007-08-16 11:01:51Z jsuchome $
+ * $Id: repositories.ycp 40437 2007-08-23 14:36:52Z sh-sh-sh $
  *
  */
 
@@ -121,20 +121,30 @@
         UI::ChangeWidget( `id( `table ), `Items, items );
     }
 
+    term repoInfoTerm(string name, string url, string category) {
+       term infoTerm =
+           `VBox (
+                  `Left (`Heading ( name     ) ),
+                  `Left (`Label   ( url      ) ),
+                  `Left (`Label   ( category ) )
+                  );
+
+       return infoTerm;
+    }
+
     void fillRepoInfo(integer index, map source) {
        map<string,any> info = getSourceInfo (index, source);
-       UI::ReplaceWidget (`id (`repo_rp), `VBox (
-           // heading - in case repo name not found
-           `Left (`Heading (info["name"]:_("Unknown repository name"))),
-           // label, %1 is URL
-           `Left (`Label (sformat (_("URL: %1"),
-               // label to be used instead of URL if not found
-               info["url"]:_("Unknown")))),
-           // label, %1 is repo category (eg. YUM)
-           `Left (`Label (sformat (_("Category: %1"),
-               // label to be used instead of repo category if not known
-               info["type"]:_("Unknown"))))
-       ));
+
+       // heading - in case repo name not found
+       string name = info["name"]:_("Unknown repository name");
+
+       // label to be used instead of URL if not found
+       string url  = sformat (_("URL: %1"), info["url"]:_("Unknown") );
+
+       // label, %1 is repo category (eg. YUM)
+       string category = sformat (_("Category: %1"), info["type"]:_("Unknown"));
+       
+       UI::ReplaceWidget (`id (`repo_rp), repoInfoTerm( name, url, category ) );
        UI::ChangeWidget (`id (`enable), `Value, info["enabled"]:true);
        UI::ChangeWidget (`id (`autorefresh), `Value, info["autorefresh"]:true);
     }
@@ -492,31 +502,34 @@
                    `HSpacing()
                ),
                `HBox (
-                   `HSpacing(0.35),
-                   `Frame ("", `HBox (`HSpacing (1), `VBox (
-                       `ReplacePoint (`id (`repo_rp), `VBox (
-                           `Left (`Heading ("Repo Name")),
-                           `Left (`Label ("URL:")),
-                           `Left (`Label ("Category:"))
-                       )),
-                       `VSpacing (0.4),
-                       // label
-                       `Left (`Label (_("Properties"))),
-                       // check box
-                       `Left (`CheckBox (`id (`enable), `opt (`notify), _("Enabled"))),
-                       // check box
-                       `Left (`CheckBox (`id (`autorefresh), `opt (`notify), _("Automatically Refresh"))),
-                       `VSpacing (0.4),
-                       (have_rug) ?
-                           `Left (`CheckBox (`id (`zmdsync),
-                               // Checkbox label
-                               _("Synchronize Changes with &ZENworks"),
-                               !norug && sync_zmd))
-                           : `Empty()
-                   ))),
-                   `HSpacing (1.35)
-               ),
-               `VSpacing(0.3),
+                      `HSpacing(0.35),
+                      `HWeight (1, `Frame ("",
+                              `HBox (
+                                     `HSpacing (1),
+                                     `HWeight( 1, `VBox (
+                                            `ReplacePoint (`id (`repo_rp),
+                                                           repoInfoTerm( "", "", "" )),
+                                            `VSpacing (0.4),
+                                            // label
+                                            `Left (`Label (_("Properties"))),
+                                            // check box
+                                            `Left (`CheckBox (`id (`enable), `opt (`notify), _("Enabled"))),
+                                            // check box
+                                            `Left (`CheckBox (`id (`autorefresh), `opt (`notify), _("Automatically Refresh"))),
+                                            `VSpacing (0.4),
+                                            (have_rug) ?
+                                            `Left (`CheckBox (`id (`zmdsync),
+                                                              // Checkbox label
+                                                              _("Synchronize Changes with &ZENworks"),
+                                                              !norug && sync_zmd))
+                                            : `Empty()
+                                            )),
+                                     `HSpacing (0.4)
+                                     )
+                              )),
+                      `HSpacing (1.35)
+                      ),
+             `VSpacing(0.3),
              `HBox(
                    `PushButton (`id (`add), `opt(`key_F3),
                        Label::AddButton ()),
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.15.63/src/include/checkmedia/ui.ycp new/yast2-packager-2.15.68/src/include/checkmedia/ui.ycp
--- old/yast2-packager-2.15.63/src/include/checkmedia/ui.ycp    2007-08-14 17:15:03.000000000 +0200
+++ new/yast2-packager-2.15.68/src/include/checkmedia/ui.ycp    2007-08-23 09:58:37.000000000 +0200
@@ -8,7 +8,7 @@
  * Authors:
  *   Ladislav Slezak <lslezak@xxxxxxx>
  *
- * $Id: ui.ycp 40268 2007-08-14 15:15:02Z jsuchome $
+ * $Id: ui.ycp 40410 2007-08-22 14:33:10Z lslezak $
  *
  * All user interface functions.
  *
@@ -27,6 +27,7 @@
 import "String";
 import "Stage";
 import "PackageSystem";
+import "GetInstArgs";
 
 define list<term> CDdevices(string preferred) {
     list<map> cds = (list<map>)SCR::Read(.probe.cdrom);
@@ -300,7 +301,7 @@
     Wizard::SetContents(caption,
        contents,
        help,
-       true, true
+       GetInstArgs::enable_back(), GetInstArgs::enable_next()
     );
 
     symbol ret = nil;
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.15.63/src/modules/PackagesUI.ycp new/yast2-packager-2.15.68/src/modules/PackagesUI.ycp
--- old/yast2-packager-2.15.63/src/modules/PackagesUI.ycp       2007-08-14 17:03:16.000000000 +0200
+++ new/yast2-packager-2.15.68/src/modules/PackagesUI.ycp       2007-08-24 16:23:32.000000000 +0200
@@ -6,7 +6,7 @@
  * Purpose:            Provides a number of common popups
  *                     for the package installation.
  *
- * $Id: PackagesUI.ycp 39963 2007-08-06 07:44:18Z locilka $
+ * $Id: PackagesUI.ycp 40474 2007-08-24 14:23:32Z locilka $
  */
 
 {
@@ -88,6 +88,12 @@
                        `VSpacing (size_y),
                        `RichText (`id (`lic), license)
                    ),
+                   // FATE #302018
+                   // TRANSLATORS: Licenses to confirm can be found here.
+                   // do not use more than 76 characters per line, keep it as short as possible
+                   `Left(`Label (_("If you like to print this license,
+check the EULA.txt file on the first media."))),
+                   `VSpacing(1),
                    `HBox (
                        `PushButton (`id (`help), Label::HelpButton ()),
                        `HStretch (),
@@ -118,13 +124,6 @@
                            `VBox (
                                `HSpacing (70),
                                `RichText (help),
-                               // FATE #302018
-                               
-                               // TRANSLATORS: Licenses to confirm can be found here.
-                               // do not use more than 76 characters per line, keep it as short as possible
-                               `Label (_("If you like to print this license,
-check the EULA.txt file on the first media.")),
-                               `VSpacing(1),
                                `HBox (
                                    `HStretch (),
                                    // push button
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.15.63/src/modules/ProductLicense.ycp new/yast2-packager-2.15.68/src/modules/ProductLicense.ycp
--- old/yast2-packager-2.15.63/src/modules/ProductLicense.ycp   2007-08-14 17:10:16.000000000 +0200
+++ new/yast2-packager-2.15.68/src/modules/ProductLicense.ycp   2007-08-24 14:36:08.000000000 +0200
@@ -24,6 +24,7 @@
 import "FileUtils";
 import "ProductFeatures";
 import "String";
+import "WorkflowManager";
 
 // IMPORTANT: maintainer of yast2-installation is responsible for this module
 
@@ -144,10 +145,12 @@
                `HSpacing (2*space),
                `VBox(
                    `Left(`RadioButton(`id(`yes),
+                       `opt(`notify),
                        // radio button
                        _("&Yes, I Agree to the License Agreement")
                    )),
                    `Left(`RadioButton(`id(`no),
+                       `opt(`notify),
                        // radio button
                        _("N&o, I Do Not Agree")
                    ))
@@ -183,7 +186,7 @@
 ");
 
     Wizard::SetContents(caption, contents, help,
-       back, true);
+       back, false);
     // bugzilla #203543
     if (size(langs) <= 1) {
        UI::ChangeWidget (`id(`lang), `Enabled, false);
@@ -493,10 +496,6 @@
        lic_lang = available_langs[0]:"";
 
     y2milestone ("Preselected language: '%1'", lic_lang);
-    DisplayLicenseDialog (available_langs, enable_back, lic_lang, licenses);
-    // Display info as a popup if exists
-    if (info_file != nil)
-       InstShowInfo::show_info_txt (info_file);
 
     if (lic_lang == nil)
     {
@@ -504,6 +503,24 @@
        return `auto;
     }
 
+    // bugzilla #303922
+    // src_id == nil (the initial product license)
+    if (src_id != nil) {
+       // use wizard with steps
+        if (Stage::initial()) {
+           Wizard::OpenNextBackStepsDialog();
+           WorkflowManager::RedrawWizardSteps();
+       // use normal wizard
+       } else {
+           Wizard::OpenNextBackDialog();
+       }
+    }
+
+    DisplayLicenseDialog (available_langs, enable_back, lic_lang, licenses);
+    // Display info as a popup if exists
+    if (info_file != nil)
+       InstShowInfo::show_info_txt (info_file);
+
     // initial loop
     symbol ret = `first;
 
@@ -520,19 +537,25 @@
        if (timeout) {
            sleep (2000);
            y2milestone("AutoYaST: License has been accepted after timeout...");
-           return `accepted;
+           ret = `accepted;
+           break;
        }
 
        ret = (symbol) UI::UserInput();
 
-       if (ret == `lang)
-       {
+       if (ret == `lang) {
            // read the selected language
            lic_lang = (string) UI::QueryWidget (`id (`lang), `Value);
 
            UI::ReplaceWidget (`id (`license_rp), GetLicenseContent (lic_lang, licenses));
+       // bugzilla #303828
+       // disabled next button unless yes/no is selected
+       } else if (ret == `yes || ret == `no) {
+           Wizard::EnableNextButton();
        }
 
+       // FIXME: rewrite this if () ... else if () ... else {};
+       //        to something readable, please!
        symbol accept = (symbol) UI::QueryWidget(`id(`eula), `CurrentButton);
        // Aborting the license dialog
        if (ret == `abort) {
@@ -540,13 +563,15 @@
            if (base_product) {
                if (Popup::ConfirmAbort (`painless)) {
                    y2milestone("Aborting...");
-                   return `abort;
+                   ret = `abort;
+                   break;
                }
            } else {
                // popup question
                if (Popup::ContinueCancel(_("Really abort the add-on product installation?"))) {
                    y2milestone("Aborting...");
-                   return `abort;
+                   ret = `abort;
+                   break;
                }
            }
        }
@@ -559,7 +584,8 @@
                if (action == "continue")
                {
                    y2milestone ("action in case of license refusal is continue, not asking user");
-                   return `accepted;
+                   ret = `accepted;
+                   break;
                }
                // text changed due to bug #162499
                string refuse_popup_text = base_product
@@ -577,12 +603,19 @@
                {
                    y2milestone("License has been declined.");
                    if (action == "abort")
-                       return `abort;
+                   {
+                       ret = `abort;
+                       break;
+                   }
                    else if (action == "continue")
-                       return `accepted;
+                   {
+                       ret = `accepted;
+                       break;
+                   }
                    else if (action == "halt")
                    {
-                       return `halt;
+                       ret = `halt;
+                       break;
                        // timed ok/cancel popup
                        if (!Popup::TimedOKCancel(_("The system is shutting down..."), 10))
                        {
@@ -590,13 +623,15 @@
                        }
                        else
                        {
-                           return `halt;
+                           ret = `halt;
+                           break;
                        }
                    }
                    else
                    {
                        y2error ("Unknown action %1", action);
-                       return `abort;
+                       ret = `abort;
+                       break;
                    }
                }
            }
@@ -604,7 +639,8 @@
            else if (accept == `yes)
            {
                y2milestone("License has been accepted.");
-               return `accepted;
+               ret = `accepted;
+               break;
            }
            else
            {
@@ -615,12 +651,19 @@
         }
        else if (ret == `back)
        {
-           return `back;
+           ret = `back;
+           break;
        }
     }
 
     CleanUpLicense(tmpdir);
 
+    // bugzilla #303922
+    if (src_id != nil) {
+       Wizard::CloseDialog();
+    }
+
+    return ret;
 }
 
 global symbol AskAddOnLicenseAgreement (integer src_id) {
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.15.63/VERSION new/yast2-packager-2.15.68/VERSION
--- old/yast2-packager-2.15.63/VERSION  2007-08-16 13:32:10.000000000 +0200
+++ new/yast2-packager-2.15.68/VERSION  2007-08-24 16:23:24.000000000 +0200
@@ -1 +1 @@
-2.15.63
+2.15.68


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



Remember to have fun...

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

< Previous Next >