Mailinglist Archive: opensuse-commit (1059 mails)

< Previous Next >
commit yast2-packager
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Thu, 24 Jan 2008 00:21:11 +0100
  • Message-id: <20080123232112.18A6F678182@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-packager
checked in at Thu Jan 24 00:21:11 CET 2008.

--------
--- yast2-packager/yast2-packager.changes 2008-01-17 13:50:47.000000000
+0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes
2008-01-22 15:33:24.771147000 +0100
@@ -1,0 +2,10 @@
+Tue Jan 22 14:56:19 CET 2008 - lslezak@xxxxxxx
+
+- callbacks - do not open a new progress window if there is
+ a progress already running (the progress will be nested in such
+ case) (#352007)
+- sw_single - use Progress:: to display the total progress at
+ start, reinitialize the target only if it is necessary
+- 2.16.16
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.cS2956/_old 2008-01-24 00:20:02.000000000 +0100
+++ /var/tmp/diff_new_pack.cS2956/_new 2008-01-24 00:20:02.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.16.15)
+# spec file for package yast2-packager (Version 2.16.16)
#
# Copyright (c) 2008 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.16.15
+Version: 2.16.16
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.16.15.tar.bz2
+Source0: yast2-packager-2.16.16.tar.bz2
Prefix: /usr
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files
yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml
# Progress::Subprogress*()
@@ -30,8 +30,8 @@
Requires: yast2-installation >= 2.15.12
# New functions: GPG key management
Requires: yast2-pkg-bindings >= 2.16.10
-# Progress::Subprogress*()
-Requires: yast2 >= 2.16.17
+# recursive Progress::New()
+Requires: yast2 >= 2.16.22
# unzipping license file
Requires: unzip
# HTTP, FTP, HTTPS modules (inst_productsources.ycp)
@@ -65,7 +65,7 @@
Arvin Schnell <arvin@xxxxxxx>

%prep
-%setup -n yast2-packager-2.16.15
+%setup -n yast2-packager-2.16.16

%build
%{prefix}/bin/y2tool y2autoconf
@@ -101,6 +101,13 @@
%{prefix}/lib/YaST2/servers_non_y2/ag_*
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Tue Jan 22 2008 lslezak@xxxxxxx
+- callbacks - do not open a new progress window if there is
+ a progress already running (the progress will be nested in such
+ case) (#352007)
+- sw_single - use Progress:: to display the total progress at
+ start, reinitialize the target only if it is necessary
+- 2.16.16
* Thu Jan 17 2008 lslezak@xxxxxxx
- use a `BusyIndicator widget instead of the animated icon
- use a map parameter in the GPG key related callbacks,

++++++ yast2-packager-2.16.15.tar.bz2 -> yast2-packager-2.16.16.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-packager-2.16.15/configure
new/yast2-packager-2.16.16/configure
--- old/yast2-packager-2.16.15/configure 2008-01-17 13:49:22.000000000
+0100
+++ new/yast2-packager-2.16.16/configure 2008-01-22 15:31:23.000000000
+0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-packager 2.16.15.
+# Generated by GNU Autoconf 2.61 for yast2-packager 2.16.16.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.16.15'
-PACKAGE_STRING='yast2-packager 2.16.15'
+PACKAGE_VERSION='2.16.16'
+PACKAGE_STRING='yast2-packager 2.16.16'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'

ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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.16.15 to adapt to many kinds of
systems.
+\`configure' configures yast2-packager 2.16.16 to adapt to many kinds of
systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1268,7 +1268,7 @@

if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.16.15:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.16.16:";;
esac
cat <<\_ACEOF

@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.16.15
+yast2-packager configure 2.16.16
generated by GNU Autoconf 2.61

Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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.16.15, which was
+It was created by yast2-packager $as_me 2.16.16, which was
generated by GNU Autoconf 2.61. Invocation command line was

$ $0 $@
@@ -2181,7 +2181,7 @@

# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.16.15'
+ VERSION='2.16.16'


cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@



-VERSION="2.16.15"
+VERSION="2.16.16"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lslezak@xxxxxxx>"

@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-packager $as_me 2.16.15, which was
+This file was extended by yast2-packager $as_me 2.16.16, which was
generated by GNU Autoconf 2.61. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.16.15
+yast2-packager config.status 2.16.16
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-packager-2.16.15/configure.in
new/yast2-packager-2.16.16/configure.in
--- old/yast2-packager-2.16.15/configure.in 2008-01-17 13:49:18.000000000
+0100
+++ new/yast2-packager-2.16.16/configure.in 2008-01-22 15:31:19.000000000
+0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(yast2-packager, 2.16.15, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.16.16, http://bugs.opensuse.org/, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])

@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)

dnl Important YaST2 variables
-VERSION="2.16.15"
+VERSION="2.16.16"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lslezak@xxxxxxx>"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-packager-2.16.15/src/clients/sw_single.ycp
new/yast2-packager-2.16.16/src/clients/sw_single.ycp
--- old/yast2-packager-2.16.15/src/clients/sw_single.ycp 2007-12-10
15:44:50.000000000 +0100
+++ new/yast2-packager-2.16.16/src/clients/sw_single.ycp 2008-01-22
15:31:02.000000000 +0100
@@ -7,7 +7,7 @@
* Purpose: contains dialog loop for workflows:
* "Install/Remove software"
*
- * $Id: sw_single.ycp 40268 2007-08-14 15:15:02Z jsuchome $
+ * $Id: sw_single.ycp 43830 2008-01-22 14:31:01Z lslezak $
*/

{
@@ -32,13 +32,28 @@
import "FileUtils";
import "PackagesUI";
import "CommandLine";
+ import "Progress";

symbol StartSWSingle()
{

Wizard::CreateDialog();
Wizard::SetDesktopIcon("sw_single");
- Wizard::SetContents(_("Initializing..."), `Empty (), "", false, true);
+
+ // a stage in the progress dialog
+ list<string> stages = [_("Initialize the Target System"), _("Load the
Configured Repositories")];
+
+ // an extra step is needed in dir inst mode
+ if (Installation::destdir != "/")
+ {
+ y2internal("Extra step is needed");
+ // %1 is path to the target system (e.g. /tmp/dirinstall
+ sformat(_("Reset the target system to %1"), Installation::destdir);
+ }
+
+ // a stage in the progress dialog
+ Progress::New(_("Starting the Package Manager"), "", 2, stages, [], "");
+ Progress::NextStage();

import "Packages";

@@ -113,7 +128,7 @@

define symbol CheckWhichPackages (list<string> arg_list)
{
- PackageSystem::EnsureTargetInit();
+ PackageSystem::EnsureTargetInit();

y2milestone ("CheckWhichPackages (%1)", arg_list);
// if sw_single is called with a list of packages or a package name
@@ -184,6 +199,8 @@

// start package manager
const boolean enabled_only = true;
+
+ Progress::NextStage();
boolean mgr_ok = Pkg::SourceStartManager(enabled_only);
if (!mgr_ok)
{
@@ -196,7 +213,14 @@
Only installed packages are displayed."));
}

- Pkg::TargetInit (Installation::destdir, false);
+ // reset the target if needed (e.g. dirinstall mode)
+ // EnsureTargetInit() uses "/" as root
+ if (Installation::destdir != "/")
+ {
+ y2milestone("Setting a new target: %1", Installation::destdir);
+ Progress::NextStage();
+ Pkg::TargetInit (Installation::destdir, false);
+ }

return `found_descr;

@@ -300,6 +324,8 @@
// check the arguments and try the mount/search for local description
symbol result = CheckWhichPackages (arg_list);

+ Progress::Finish();
+
Pkg::SetTextLocale (UI::GetLanguage (true));

y2milestone ("SW_SINGLE: result CheckWhichPackages %1", result);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/yast2-packager-2.16.15/src/modules/PackageCallbacks.ycp
new/yast2-packager-2.16.16/src/modules/PackageCallbacks.ycp
--- old/yast2-packager-2.16.15/src/modules/PackageCallbacks.ycp 2008-01-17
13:48:03.000000000 +0100
+++ new/yast2-packager-2.16.16/src/modules/PackageCallbacks.ycp 2008-01-22
15:31:02.000000000 +0100
@@ -7,7 +7,7 @@
*
* Purpose: provides the default Callbacks for Pkg::
*
- * $Id: PackageCallbacks.ycp 43713 2008-01-17 12:48:02Z lslezak $
+ * $Id: PackageCallbacks.ycp 43830 2008-01-22 14:31:01Z lslezak $
*
*/

@@ -87,7 +87,7 @@

boolean FullScreen()
{
- boolean ret = UI::WidgetExists(`subprogress_replace_point);
+ boolean ret = UI::WidgetExists(`progress_replace_point);
y2debug("Running in fullscreen mode: %1", ret);
return ret;
}
@@ -2240,6 +2240,8 @@

integer last_stage = 0;

+integer close_wizard = 0;
+
/**
* Hanler for ProcessStart callback - handle start of a package manager process
* @param task Decription of the task
@@ -2250,16 +2252,21 @@
{
y2milestone("Process: Start: task: %1, stages: %2, help: %3", task, stages,
help);

- if (Progress::status())
- {
- Wizard::CreateDialog();
- Wizard::SetDesktopIcon("sw_single");
-
- // set 100% as max value
- Progress::New(task, "", 100, stages, [], help);
- Progress::Title(task);
- last_stage = 0;
- }
+ if (Progress::status())
+ {
+ if (!Progress::IsRunning())
+ {
+ Wizard::CreateDialog();
+ Wizard::SetDesktopIcon("sw_single");
+
+ close_wizard = close_wizard + 1;
+ }
+
+ // set 100% as max value
+ Progress::New(task, "", 100, stages, [], help);
+ Progress::Title(task);
+ last_stage = 0;
+ }
}

/**
@@ -2295,7 +2302,12 @@
// set 100%
Progress::Finish();

- Wizard::CloseDialog();
+ if (close_wizard == 1)
+ {
+ Wizard::CloseDialog();
+ }
+
+ close_wizard = close_wizard - 1;
}

// EOF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-packager-2.16.15/VERSION
new/yast2-packager-2.16.16/VERSION
--- old/yast2-packager-2.16.15/VERSION 2008-01-17 13:45:10.000000000 +0100
+++ new/yast2-packager-2.16.16/VERSION 2008-01-22 15:30:38.000000000 +0100
@@ -1 +1 @@
-2.16.15
+2.16.16


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



Remember to have fun...

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

< Previous Next >