Hello community,
here is the log from the commit of package yast2-ncurses-pkg
checked in at Thu Oct 23 22:48:36 CEST 2008.
--------
--- yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2008-10-15 15:30:18.000000000 +0200
+++ /d/STABLE/yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2008-10-23 19:25:28.016616000 +0200
@@ -1,0 +2,16 @@
+Thu Oct 23 19:14:46 CEST 2008 - kmachalkova@suse.cz
+
+- Added explanation of 'satisfied' (:-)) pattern/language
+ status (bnc#432528)
+- Exclude readonly directories from the checking of available
+ diskspace(bnc#384368)
+- 2.17.8
+
+-------------------------------------------------------------------
+Wed Oct 22 12:56:04 CEST 2008 - gs@suse.de
+
+- Show a "Searching..." popup during package search
+- Warning message added to disk error popup
+- Internal changes: disk space testing enabled, comments added
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-ncurses-pkg-2.17.7.tar.bz2
New:
----
yast2-ncurses-pkg-2.17.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ncurses-pkg.spec ++++++
--- /var/tmp/diff_new_pack.tQ1256/_old 2008-10-23 22:47:37.000000000 +0200
+++ /var/tmp/diff_new_pack.tQ1256/_new 2008-10-23 22:47:37.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ncurses-pkg (Version 2.17.7)
+# spec file for package yast2-ncurses-pkg (Version 2.17.8)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-ncurses-pkg
-Version: 2.17.7
+Version: 2.17.8
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ncurses-pkg-2.17.7.tar.bz2
+Source0: yast2-ncurses-pkg-2.17.8.tar.bz2
Prefix: /usr
BuildRequires: dejagnu doxygen gcc-c++ yast2-core-devel yast2-devtools
BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel yast2-ncurses-devel
@@ -45,7 +45,7 @@
%prep
-%setup -n yast2-ncurses-pkg-2.17.7
+%setup -n yast2-ncurses-pkg-2.17.8
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,8 +74,17 @@
%{_libdir}/YaST2/plugin/libpy2ncurses_pkg.so.*
%{_libdir}/YaST2/plugin/libpy2ncurses_pkg.so
%doc %{prefix}/share/doc/packages/yast2-ncurses-pkg
-
%changelog
+* Thu Oct 23 2008 kmachalkova@suse.cz
+- Added explanation of 'satisfied' (:-)) pattern/language
+ status (bnc#432528)
+- Exclude readonly directories from the checking of available
+ diskspace(bnc#384368)
+- 2.17.8
+* Wed Oct 22 2008 gs@suse.de
+- Show a "Searching..." popup during package search
+- Warning message added to disk error popup
+- Internal changes: disk space testing enabled, comments added
* Wed Oct 15 2008 sh@suse.de
- Require latest libyui-devel (API change!)
- V 2.17.7
++++++ yast2-ncurses-pkg-2.17.7.tar.bz2 -> yast2-ncurses-pkg-2.17.8.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.7/configure new/yast2-ncurses-pkg-2.17.8/configure
--- old/yast2-ncurses-pkg-2.17.7/configure 2008-10-01 14:14:09.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.8/configure 2008-10-23 19:21:54.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-ncurses-pkg 2.17.6.
+# Generated by GNU Autoconf 2.61 for yast2-ncurses-pkg 2.17.8.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-ncurses-pkg'
PACKAGE_TARNAME='yast2-ncurses-pkg'
-PACKAGE_VERSION='2.17.6'
-PACKAGE_STRING='yast2-ncurses-pkg 2.17.6'
+PACKAGE_VERSION='2.17.8'
+PACKAGE_STRING='yast2-ncurses-pkg 2.17.8'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -899,9 +899,6 @@
am__fastdepCC_TRUE
am__fastdepCC_FALSE
CPP
-PKG_CONFIG
-Y2CORE_CFLAGS
-Y2CORE_LIBS
AGENT_LIBADD
SED
GREP
@@ -917,6 +914,7 @@
ac_ct_F77
LIBTOOL
ALLOCA
+PKG_CONFIG
ZYPP_CFLAGS
ZYPP_LIBS
LIBOBJS
@@ -935,12 +933,10 @@
CC
CFLAGS
CPP
-PKG_CONFIG
-Y2CORE_CFLAGS
-Y2CORE_LIBS
CXXCPP
F77
FFLAGS
+PKG_CONFIG
ZYPP_CFLAGS
ZYPP_LIBS'
@@ -1445,7 +1441,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-ncurses-pkg 2.17.6 to adapt to many kinds of systems.
+\`configure' configures yast2-ncurses-pkg 2.17.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1516,7 +1512,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-ncurses-pkg 2.17.6:";;
+ short | recursive ) echo "Configuration of yast2-ncurses-pkg 2.17.8:";;
esac
cat <<\_ACEOF
@@ -1554,13 +1550,10 @@
CC C compiler command
CFLAGS C compiler flags
CPP C preprocessor
- PKG_CONFIG path to pkg-config utility
- Y2CORE_CFLAGS
- C compiler flags for Y2CORE, overriding pkg-config
- Y2CORE_LIBS linker flags for Y2CORE, overriding pkg-config
CXXCPP C++ preprocessor
F77 Fortran 77 compiler command
FFLAGS Fortran 77 compiler flags
+ PKG_CONFIG path to pkg-config utility
ZYPP_CFLAGS C compiler flags for ZYPP, overriding pkg-config
ZYPP_LIBS linker flags for ZYPP, overriding pkg-config
@@ -1628,7 +1621,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-ncurses-pkg configure 2.17.6
+yast2-ncurses-pkg configure 2.17.8
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1642,7 +1635,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-ncurses-pkg $as_me 2.17.6, which was
+It was created by yast2-ncurses-pkg $as_me 2.17.8, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2463,7 +2456,7 @@
# Define the identity of the package.
PACKAGE='yast2-ncurses-pkg'
- VERSION='2.17.6'
+ VERSION='2.17.8'
cat >>confdefs.h <<_ACEOF
@@ -2691,7 +2684,7 @@
-VERSION="2.17.6"
+VERSION="2.17.8"
RPMNAME="yast2-ncurses-pkg"
MAINTAINER="Katarina Machalkova "
@@ -4856,247 +4849,8 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-# If we have core, get its Y2CORE_CFLAGS.
-# When building core itself, it has set Y2CORE_CFLAGS elsewhere already
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
- if test "x$ac_pt_PKG_CONFIG" = x; then
- PKG_CONFIG=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- PKG_CONFIG=$ac_pt_PKG_CONFIG
- fi
-else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.9.0
- { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- PKG_CONFIG=""
- fi
-
-fi
-if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5
- ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-
-
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for Y2CORE" >&5
-echo $ECHO_N "checking for Y2CORE... $ECHO_C" >&6; }
-
-if test -n "$Y2CORE_CFLAGS"; then
- pkg_cv_Y2CORE_CFLAGS="$Y2CORE_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5
- ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_Y2CORE_CFLAGS=`$PKG_CONFIG --cflags "yast2-core" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$Y2CORE_LIBS"; then
- pkg_cv_Y2CORE_LIBS="$Y2CORE_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5
- ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_Y2CORE_LIBS=`$PKG_CONFIG --libs "yast2-core" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- Y2CORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "yast2-core" 2>&1`
- else
- Y2CORE_PKG_ERRORS=`$PKG_CONFIG --print-errors "yast2-core" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$Y2CORE_PKG_ERRORS" >&5
-
- { { echo "$as_me:$LINENO: error: Package requirements (yast2-core) were not met:
-
-$Y2CORE_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables Y2CORE_CFLAGS
-and Y2CORE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-echo "$as_me: error: Package requirements (yast2-core) were not met:
-
-$Y2CORE_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables Y2CORE_CFLAGS
-and Y2CORE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables Y2CORE_CFLAGS
-and Y2CORE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see http://pkg-config.freedesktop.org/.
-See \`config.log' for more details." >&5
-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables Y2CORE_CFLAGS
-and Y2CORE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see http://pkg-config.freedesktop.org/.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-else
- Y2CORE_CFLAGS=$pkg_cv_Y2CORE_CFLAGS
- Y2CORE_LIBS=$pkg_cv_Y2CORE_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- :
-fi
-
-fi
-
-CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
-CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2"
+CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
+CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2"
: ${AGENT_LIBADD:='-L$(libdir) -lscr'}
@@ -5816,7 +5570,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5819 "configure"' > conftest.$ac_ext
+ echo '#line 5573 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8171,11 +7925,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8174: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7928: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8178: \$? = $ac_status" >&5
+ echo "$as_me:7932: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8461,11 +8215,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8464: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8218: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8468: \$? = $ac_status" >&5
+ echo "$as_me:8222: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8565,11 +8319,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8568: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8322: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8572: \$? = $ac_status" >&5
+ echo "$as_me:8326: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10929,7 +10683,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:13187: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13437: \$? = $ac_status" >&5
+ echo "$as_me:13191: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13534,11 +13288,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13537: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13291: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13541: \$? = $ac_status" >&5
+ echo "$as_me:13295: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15117,11 +14871,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15120: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14874: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15124: \$? = $ac_status" >&5
+ echo "$as_me:14878: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15221,11 +14975,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15224: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14978: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15228: \$? = $ac_status" >&5
+ echo "$as_me:14982: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17428,11 +17182,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17431: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17185: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17435: \$? = $ac_status" >&5
+ echo "$as_me:17189: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17718,11 +17472,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17721: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17475: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17725: \$? = $ac_status" >&5
+ echo "$as_me:17479: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17822,11 +17576,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17825: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17579: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17829: \$? = $ac_status" >&5
+ echo "$as_me:17583: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21174,6 +20928,126 @@
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ PKG_CONFIG=""
+ fi
+
+fi
+
pkg_failed=no
{ echo "$as_me:$LINENO: checking for ZYPP" >&5
echo $ECHO_N "checking for ZYPP... $ECHO_C" >&6; }
@@ -21714,7 +21588,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-ncurses-pkg $as_me 2.17.6, which was
+This file was extended by yast2-ncurses-pkg $as_me 2.17.8, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21767,7 +21641,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-ncurses-pkg config.status 2.17.6
+yast2-ncurses-pkg config.status 2.17.8
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -22119,9 +21993,6 @@
am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
CPP!$CPP$ac_delim
-PKG_CONFIG!$PKG_CONFIG$ac_delim
-Y2CORE_CFLAGS!$Y2CORE_CFLAGS$ac_delim
-Y2CORE_LIBS!$Y2CORE_LIBS$ac_delim
AGENT_LIBADD!$AGENT_LIBADD$ac_delim
SED!$SED$ac_delim
GREP!$GREP$ac_delim
@@ -22137,13 +22008,14 @@
ac_ct_F77!$ac_ct_F77$ac_delim
LIBTOOL!$LIBTOOL$ac_delim
ALLOCA!$ALLOCA$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
ZYPP_CFLAGS!$ZYPP_CFLAGS$ac_delim
ZYPP_LIBS!$ZYPP_LIBS$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.7/configure.in new/yast2-ncurses-pkg-2.17.8/configure.in
--- old/yast2-ncurses-pkg-2.17.7/configure.in 2008-10-01 14:13:46.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.8/configure.in 2008-10-23 19:21:39.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-ncurses-pkg
dnl
-dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ncurses-pkg, 2.17.6, http://bugs.opensuse.org/, yast2-ncurses-pkg)
+AC_INIT(yast2-ncurses-pkg, 2.17.8, http://bugs.opensuse.org/, yast2-ncurses-pkg)
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.17.6"
+VERSION="2.17.8"
RPMNAME="yast2-ncurses-pkg"
MAINTAINER="Katarina Machalkova "
@@ -144,14 +144,8 @@
AC_PROG_CC
AC_PROG_CPP
-# If we have core, get its Y2CORE_CFLAGS.
-# When building core itself, it has set Y2CORE_CFLAGS elsewhere already
-PKG_CHECK_EXISTS([yast2-core],[
- PKG_CHECK_MODULES(Y2CORE, yast2-core)
-])
-
-CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
-CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2"
+CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
+CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2"
: ${AGENT_LIBADD:='-L$(libdir) -lscr'}
AC_SUBST(AGENT_LIBADD)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.7/doc/autodocs/Makefile.in new/yast2-ncurses-pkg-2.17.8/doc/autodocs/Makefile.in
--- old/yast2-ncurses-pkg-2.17.7/doc/autodocs/Makefile.in 2008-10-01 14:14:12.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.8/doc/autodocs/Makefile.in 2008-10-23 19:21:57.000000000 +0200
@@ -142,8 +142,6 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
-Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
-Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
ZYPP_CFLAGS = @ZYPP_CFLAGS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.7/doc/Makefile.in new/yast2-ncurses-pkg-2.17.8/doc/Makefile.in
--- old/yast2-ncurses-pkg-2.17.7/doc/Makefile.in 2008-10-01 14:14:12.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.8/doc/Makefile.in 2008-10-23 19:21:57.000000000 +0200
@@ -125,8 +125,6 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
-Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
-Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
ZYPP_CFLAGS = @ZYPP_CFLAGS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.7/Makefile.in new/yast2-ncurses-pkg-2.17.8/Makefile.in
--- old/yast2-ncurses-pkg-2.17.7/Makefile.in 2008-10-01 14:14:12.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.8/Makefile.in 2008-10-23 19:21:57.000000000 +0200
@@ -161,8 +161,6 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = $(shell cat $(srcdir)/VERSION)
XGETTEXT = @XGETTEXT@
-Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
-Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
ZYPP_CFLAGS = @ZYPP_CFLAGS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.7/src/Makefile.in new/yast2-ncurses-pkg-2.17.8/src/Makefile.in
--- old/yast2-ncurses-pkg-2.17.7/src/Makefile.in 2008-10-01 14:14:12.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.8/src/Makefile.in 2008-10-23 19:21:57.000000000 +0200
@@ -161,8 +161,6 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
-Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
-Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
ZYPP_CFLAGS = @ZYPP_CFLAGS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.7/src/NCPackageSelector.cc new/yast2-ncurses-pkg-2.17.8/src/NCPackageSelector.cc
--- old/yast2-ncurses-pkg-2.17.7/src/NCPackageSelector.cc 2008-10-15 15:30:09.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.8/src/NCPackageSelector.cc 2008-10-23 19:14:29.000000000 +0200
@@ -1061,8 +1061,9 @@
// open the popup e.g. with the text "/usr needs 50 MB more disk space"
NCPopupInfo * spaceMsg = new NCPopupInfo( wpos( (NCurses::lines()-10)/2, (NCurses::cols()-50)/2 ),
NCPkgStrings::ErrorLabel(),
- NCPkgStrings::DiskSpaceError() + "<br>" + message,
- NCPkgStrings::OKLabel(),
+ NCPkgStrings::DiskSpaceError() + "<br>" + message +
+ _("You can choose to install anyway, but you risk getting a corrupted system."),
+ _("&Continue anyway"),
NCPkgStrings::CancelLabel() );
spaceMsg->setPreferredSize( 50, 10 );
@@ -1345,37 +1346,19 @@
//
void NCPackageSelector::showDiskSpace()
{
- zypp::ZYpp::Ptr z = zypp::getZYpp();
- zypp::DiskUsageCounter::MountPointSet du = z->diskUsage ();
- zypp::DiskUsageCounter::MountPointSet::iterator
- b = du.begin (),
- e = du.end (),
- it;
- if (b == e)
- {
- // retry after detecting from the target
- z->setPartitions(zypp::DiskUsageCounter::detectMountPoints ());
- du = z->diskUsage();
- b = du.begin ();
- e = du.end ();
- }
-
- zypp::ByteCount diff = 0;
- for (it = b; it != e; ++it)
- {
- diff += (it->pkg_size - it->used_size) * 1024;
- }
-
- // show pkg_diff, i.e. total difference of disk space (can be negative in installed system
- // if packages are deleted)
- if ( diskspaceLabel )
- {
- diskspaceLabel->setText( diff.asString() );
- }
+
// check whether required diskspace enters the warning range
if ( diskspacePopup )
+ {
diskspacePopup->checkDiskSpaceRange( );
+ // show pkg_diff, i.e. total difference of disk space (can be negative in installed system
+ // if packages are deleted)
+ if ( diskspaceLabel )
+ {
+ diskspaceLabel->setText( diskspacePopup->calculateDiff().asString() );
+ }
+ }
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.7/src/NCPackageSelector.h new/yast2-ncurses-pkg-2.17.8/src/NCPackageSelector.h
--- old/yast2-ncurses-pkg-2.17.7/src/NCPackageSelector.h 2008-09-26 11:17:09.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.8/src/NCPackageSelector.h 2008-10-23 19:14:29.000000000 +0200
@@ -275,6 +275,8 @@
bool isAutoCheck() { return autoCheck; }
+ bool isTestMode() { return testMode; }
+
void AutoCheck( bool check) { autoCheck = check; }
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.7/src/NCPackageSelectorPluginImpl.cc new/yast2-ncurses-pkg-2.17.8/src/NCPackageSelectorPluginImpl.cc
--- old/yast2-ncurses-pkg-2.17.7/src/NCPackageSelectorPluginImpl.cc 2008-06-10 16:00:07.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.8/src/NCPackageSelectorPluginImpl.cc 2008-10-23 19:14:29.000000000 +0200
@@ -37,7 +37,7 @@
NCPackageSelectorPluginImpl PSP;
YPackageSelector * NCPackageSelectorPluginImpl::createPackageSelector( YWidget * parent,
- long modeFlags )
+ long modeFlags )
{
YWidget * w = 0;
@@ -54,13 +54,8 @@
yuiError() << "Caught an unspecified exception" << endl;
}
- // FIXME - remove debug logging
- YDialog::currentDialog()->dumpWidgetTree();
- NCWidget * firstChild = dynamic_cast(YDialog::currentDialog()->firstChild());
- if ( firstChild )
- yuiMilestone() << "FIRST child: " << firstChild << endl;
- yuiMilestone() << "Selector: " << w << endl;
- // FIXME ???
+ yuiMilestone() << "Package selector created: " << w << endl;
+
return (YPackageSelector *)(w);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.7/src/NCPkgFilterSearch.cc new/yast2-ncurses-pkg-2.17.8/src/NCPkgFilterSearch.cc
--- old/yast2-ncurses-pkg-2.17.7/src/NCPkgFilterSearch.cc 2008-09-26 11:17:09.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.8/src/NCPkgFilterSearch.cc 2008-10-23 19:14:29.000000000 +0200
@@ -34,6 +34,7 @@
#include "NCPkgStrings.h"
#include "NCPackageSelector.h"
#include "NCPkgSearchSettings.h"
+#include "NCPopupInfo.h"
#include "NCi18n.h"
@@ -215,6 +216,13 @@
if ( checkRequires )
q.addAttribute( zypp::sat::SolvAttr("solvable:requires") );
+ NCPopupInfo * info = new NCPopupInfo( wpos( (NCurses::lines()-4)/2, (NCurses::cols()-18)/2 ),
+ "",
+ _("Searching...")
+ );
+ info->setPreferredSize( 18, 4 );
+ info->popup();
+
for( zypp::PoolQuery::Selectable_iterator it = q.selectableBegin();
it != q.selectableEnd(); it++)
{
@@ -222,6 +230,9 @@
packageList->createListEntry ( pkg, *it);
}
+ info->popdown();
+ YDialog::deleteTopmostDialog();
+
int found_pkgs = packageList->getNumLines();
ostringstream s;
s << boost::format( _( "%d packages found")) % found_pkgs;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.7/src/NCPkgPopupDiskspace.cc new/yast2-ncurses-pkg-2.17.8/src/NCPkgPopupDiskspace.cc
--- old/yast2-ncurses-pkg-2.17.7/src/NCPkgPopupDiskspace.cc 2008-06-26 20:20:28.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.8/src/NCPkgPopupDiskspace.cc 2008-10-23 19:14:29.000000000 +0200
@@ -54,7 +54,7 @@
///////////////////////////////////////////////////////////////////
//
//
-// METHOD NAME : NCPkgPopupDiskspace::NCPkgPopupDiskspace
+// METHOD NAME : NCPkgDiskspace::NCPkgDiskspace
// METHOD TYPE : Constructor
//
// DESCRIPTION :
@@ -75,7 +75,7 @@
///////////////////////////////////////////////////////////////////
//
//
-// METHOD NAME : NCPkgPopupDiskspace::~NCPkgPopupDiskspace
+// METHOD NAME : NCPkgDiskspace::~NCPkgDiskspace
// METHOD TYPE : Destructor
//
// DESCRIPTION :
@@ -87,7 +87,7 @@
///////////////////////////////////////////////////////////////////
//
//
-// METHOD NAME : NCPkgPopupDiskspace::fillPartitionTable
+// METHOD NAME : NCPkgDiskspace::fillPartitionTable
// METHOD TYPE : void
//
// DESCRIPTION :
@@ -101,8 +101,8 @@
int i = 0;
zypp::ZYpp::Ptr z = zypp::getZYpp();
- zypp::DiskUsageCounter::MountPointSet du = z->diskUsage ();
- zypp::DiskUsageCounter::MountPointSet::iterator
+ ZyppDuSet du = z->diskUsage ();
+ ZyppDuSetIterator
b = du.begin (),
e = du.end (),
it;
@@ -141,18 +141,19 @@
///////////////////////////////////////////////////////////////////
//
//
-// METHOD NAME : NCPkgPopupDiskspace::checkDiskSpace
+// METHOD NAME : NCPkgDiskspace::checkDiskSpace
// METHOD TYPE : string
//
-// DESCRIPTION :
+// DESCRIPTION : called to check disk space before installation
+// (after OK button is pressed)
//
string NCPkgDiskspace::checkDiskSpace()
{
string text = "";
zypp::ZYpp::Ptr z = zypp::getZYpp();
- zypp::DiskUsageCounter::MountPointSet du = z->diskUsage ();
- zypp::DiskUsageCounter::MountPointSet::iterator
+ ZyppDuSet du = z->diskUsage ();
+ ZyppDuSetIterator
b = du.begin (),
e = du.end (),
it;
@@ -167,6 +168,9 @@
for (it = b; it != e; ++it)
{
+ if (it->readonly)
+ continue;
+
zypp::ByteCount pkg_available = (it->total_size - it->pkg_size) * 1024;
if ( pkg_available < 0 )
{
@@ -186,6 +190,15 @@
return text;
}
+///////////////////////////////////////////////////////////////////
+//
+//
+// METHOD NAME : NCPkgDiskspace::checkRemainingDiskSpace
+// METHOD TYPE : void
+//
+// DESCRIPTION : check whether remaining disk space enters
+// warning or error range
+//
void NCPkgDiskspace::checkRemainingDiskSpace( const ZyppPartitionDu & partition )
{
FSize usedSize ( partition.pkg_size, FSize::K );
@@ -227,27 +240,20 @@
if ( free < OVERFLOW_MB_PROXIMITY )
overflowWarning.enterProximity();
-#ifdef TEST
- yuiMilestone() << "Overflow: " << "_inRange: " << (overflowWarning._inRange?"true":"false") << endl;
- yuiMilestone() << "Overflow: " << "_isClose: " << (overflowWarning._isClose?"true":"false") << endl;
- yuiMilestone() << "Overflow: " << "_hasBeenClose: " << (overflowWarning._hasBeenClose?"true":"false") << endl;
- yuiMilestone() << "Overflow: " << "_warningPosted: " << (overflowWarning._warningPosted?"true":"false") << endl;
-
- yuiMilestone() << "RunningOut: " << "_inRange: " << (runningOutWarning._inRange?"true":"false") << endl;
- yuiMilestone() << "RunningOut: " << "_isClose: " << (runningOutWarning._isClose?"true":"false") << endl;
- yuiMilestone() << "RunningOut: " << "_hasBeenClose: " << (runningOutWarning._hasBeenClose?"true":"false") << endl;
- yuiMilestone() << "RunningOut: " << "_warningPosted: " << (runningOutWarning._warningPosted?"true":"false") << endl;
-#endif
}
///////////////////////////////////////////////////////////////////
//
//
-// METHOD NAME : NCPkgPopupDiskspace::setDiskSpace
+// METHOD NAME : NCPkgDiskspace::setDiskSpace
// METHOD TYPE : void
//
-// DESCRIPTION : for testing only; called from PackageSelector
-// if running in testMode
+// DESCRIPTION : For testing only; called from NCPkgTable if the PackageSelector
+// running in testMode
+// TESTDESCRIPTION: Call `PackageSelector with `opt(`testMode) (ycp example).
+// With focus on the package list press '+' or '-' to
+// increase/decrease used diskspace (see y2log).
+// Use the 'Actions' menu to select/delete a package.
//
void NCPkgDiskspace::setDiskSpace( wint_t ch )
{
@@ -275,16 +281,21 @@
percent = 0;
partitionDu.pkg_size = partitionDu.total_size * percent / 100;
+
+ FSize newSize ( partitionDu.pkg_size, FSize::K );
+
+ yuiMilestone() << "Used size (MB): " << newSize / FSize::MB << endl;
+ yuiMilestone() << "Total size (MB): " << totalSize / FSize::MB << endl;
}
}
///////////////////////////////////////////////////////////////////
//
//
-// METHOD NAME : NCPkgPopupDiskspace::checkDiskSpaceRange
+// METHOD NAME : NCPkgDiskspace::checkDiskSpaceRange
// METHOD TYPE : void
//
-// DESCRIPTION :
+// DESCRIPTION : calls checkRemaingDiskspace for every partition
//
void NCPkgDiskspace::checkDiskSpaceRange( )
{
@@ -302,6 +313,9 @@
it != diskUsage.end();
++it )
{
+ //Exclude readonly dirs from the check (#384368)
+ if( it->readonly )
+ continue;
checkRemainingDiskSpace( *it );
}
@@ -327,6 +341,14 @@
if ( runningOutWarning.leavingProximity() )
runningOutWarning.clearHistory();
+ if ( testmode )
+ {
+ yuiMilestone() << "Running out Warning:" << endl;
+ runningOutWarning.logSettings();
+
+ yuiMilestone() << "Overflow Warning:" << endl;
+ overflowWarning.logSettings();
+ }
}
string NCPkgDiskspace::usedPercent( FSize used, FSize total )
@@ -345,7 +367,7 @@
///////////////////////////////////////////////////////////////////
//
//
-// METHOD NAME : NCPkgPopupDiskspace::showInfoPopup
+// METHOD NAME : NCPkgDiskspace::showInfoPopup
// METHOD TYPE : void
//
// DESCRIPTION :
@@ -358,9 +380,40 @@
fillPartitionTable();
popupWin->doit();
YDialog::deleteTopmostDialog();
+}
+
+zypp::ByteCount NCPkgDiskspace::calculateDiff()
+{
+ zypp::ZYpp::Ptr z = zypp::getZYpp();
+ ZyppDuSet du = z->diskUsage ();
+ ZyppDuSetIterator
+ b = du.begin (),
+ e = du.end (),
+ it;
+ if (b == e)
+ {
+ // retry after detecting from the target
+ z->setPartitions(zypp::DiskUsageCounter::detectMountPoints ());
+ du = z->diskUsage();
+ b = du.begin ();
+ e = du.end ();
+ }
+
+ zypp::ByteCount diff = 0;
+ for (it = b; it != e; ++it)
+ {
+ diff += (it->pkg_size - it->used_size) * 1024;
}
+ return diff;
+}
+//////////////////////////////////////////////////////////////////
+//
+//
+// METHOD NAME : NCPkgPopupDiskspace::NCPkgPopupDiskspace
+// METHOD TYPE : Constructor
+//
NCPkgPopupDiskspace::NCPkgPopupDiskspace( const wpos at, string headline )
: NCPopup( at, false )
, partitions( 0 )
@@ -370,10 +423,24 @@
createLayout( headline );
}
+///////////////////////////////////////////////////////////////////
+//
+//
+// METHOD NAME : NCPkgPopupDiskspace::~NCPkgPopupDiskspace
+// METHOD TYPE : Destructor
+//
NCPkgPopupDiskspace::~NCPkgPopupDiskspace()
{
}
+//////////////////////////////////////////////////////////////////
+//
+//
+// METHOD NAME : NCPkgPopupDiskspace::createLyout
+// METHOD TYPE : void
+//
+// DESCRIPTION : create layout (partition table)
+//
void NCPkgPopupDiskspace::createLayout( string headline )
{
// the vertical split is the (only) child of the dialog
@@ -545,4 +612,12 @@
return _inRange && ! _warningPosted;
}
+void
+NCPkgWarningRangeNotifier::logSettings() const
+{
+ yuiMilestone() << "in range: " << (_inRange?"true":"false") << endl;
+ yuiMilestone() << "is close: " << (_isClose?"true":"false") << endl;
+ yuiMilestone() << "has been close: " << (_hasBeenClose?"true":"false") << endl;
+ yuiMilestone() << "warning posted: " << (_warningPosted?"true":"false") << endl;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.7/src/NCPkgPopupDiskspace.h new/yast2-ncurses-pkg-2.17.8/src/NCPkgPopupDiskspace.h
--- old/yast2-ncurses-pkg-2.17.7/src/NCPkgPopupDiskspace.h 2008-06-10 16:00:06.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.8/src/NCPkgPopupDiskspace.h 2008-10-23 19:14:29.000000000 +0200
@@ -111,6 +111,11 @@
**/
bool leavingProximity() const;
+ /*
+ * Log settings to y2log
+ */
+ void logSettings() const;
+
/**
* Clear the current values, i.e. prepare for a new round of checks
**/
@@ -207,6 +212,8 @@
void showInfoPopup( string headline );
void checkRemainingDiskSpace( const ZyppPartitionDu & partition );
+
+ zypp::ByteCount calculateDiff();
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.7/src/NCPkgTable.cc new/yast2-ncurses-pkg-2.17.8/src/NCPkgTable.cc
--- old/yast2-ncurses-pkg-2.17.7/src/NCPkgTable.cc 2008-10-15 15:30:09.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.8/src/NCPkgTable.cc 2008-10-23 19:14:29.000000000 +0200
@@ -24,7 +24,7 @@
#include "NCPopupInfo.h"
#include "NCPkgStrings.h"
#include "NCi18n.h"
-
+#include "NCPkgPopupDiskspace.h"
#include "NCPackageSelector.h"
#include
#include "NCZypp.h"
@@ -792,6 +792,13 @@
// call handleInput of NCPad
handleInput( key );
+
+ if ( packager->isTestMode() )
+ {
+ if ( packager->diskSpacePopup() )
+ packager->diskSpacePopup()->setDiskSpace( key );
+ return ret;
+ }
switch ( key )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.7/VERSION new/yast2-ncurses-pkg-2.17.8/VERSION
--- old/yast2-ncurses-pkg-2.17.7/VERSION 2008-10-15 14:34:52.000000000 +0200
+++ new/yast2-ncurses-pkg-2.17.8/VERSION 2008-10-23 19:20:01.000000000 +0200
@@ -1 +1 @@
-2.17.7
+2.17.8
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org