Hello community,
here is the log from the commit of package yast2-packager for openSUSE:12.1
checked in at 2011-11-02 12:22:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1/yast2-packager (Old)
and /work/SRC/openSUSE:12.1/.yast2-packager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager", Maintainer is "lsle...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.1/yast2-packager/yast2-packager.changes
2011-10-24 13:37:53.000000000 +0200
+++ /work/SRC/openSUSE:12.1/.yast2-packager.new/yast2-packager.changes
2011-11-02 12:22:51.000000000 +0100
@@ -1,0 +2,15 @@
+Tue Nov 1 13:21:19 UTC 2011 - lsle...@suse.cz
+
+- fixed free space check for very small partitions (~15MB), do not
+ report insufficient disk space when there is actually nothing
+ to install on it (bnc#724894)
+- 2.21.22
+
+-------------------------------------------------------------------
+Mon Oct 31 17:46:14 UTC 2011 - lsle...@suse.cz
+
+- copy the metadata cache after saving repository setup to not
+ confuse the package manager (avoid matadata cleanup) (bnc#700881)
+- 2.21.21
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.21.20.tar.bz2
New:
----
yast2-packager-2.21.22.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.Kldo4I/_old 2011-11-02 12:22:51.000000000 +0100
+++ /var/tmp/diff_new_pack.Kldo4I/_new 2011-11-02 12:22:51.000000000 +0100
@@ -19,13 +19,11 @@
Name: yast2-packager
-Version: 2.21.20
+Version: 2.21.22
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.21.20.tar.bz2
-
-Prefix: /usr
+Source0: yast2-packager-%{version}.tar.bz2
Group: System/YaST
License: GPL-2.0+
@@ -100,26 +98,26 @@
(webpin) and installing them via OneClickInstall
%prep
-%setup -n yast2-packager-2.21.20
+%setup -n yast2-packager-%{version}
%build
-%{prefix}/bin/y2tool y2autoconf
-%{prefix}/bin/y2tool y2automake
+%{_prefix}/bin/y2tool y2autoconf
+%{_prefix}/bin/y2tool y2automake
autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
-./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
+./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
# V=1: verbose build in case we used AM_SILENT_RULES(yes)
# so that RPM_OPT_FLAGS check works
make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
-[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] ||
Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
-for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name
"*.desktop"` ; do
+[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] ||
Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
+for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name
"*.desktop"` ; do
d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
@@ -138,17 +136,17 @@
/usr/share/YaST2/modules/*
%exclude /usr/share/YaST2/modules/WebpinPackageSearch.ycp
%exclude /usr/share/YaST2/modules/WebpinPackageSearch.ybc
-%{prefix}/share/applications/YaST2/*.desktop
-%exclude %{prefix}/share/applications/YaST2/webpin.desktop
+%{_prefix}/share/applications/YaST2/*.desktop
+%exclude %{_prefix}/share/applications/YaST2/webpin.desktop
/usr/share/YaST2/scrconf/*
-%{prefix}/lib/YaST2/servers_non_y2/ag_*
-%doc %{prefix}/share/doc/packages/yast2-packager
+%{_prefix}/lib/YaST2/servers_non_y2/ag_*
+%doc %{_prefix}/share/doc/packages/yast2-packager
%files webpin
%defattr(-,root,root)
/usr/share/YaST2/clients/webpin_package_search.ycp
/usr/share/YaST2/modules/WebpinPackageSearch.ycp
/usr/share/YaST2/modules/WebpinPackageSearch.ybc
-%{prefix}/share/applications/YaST2/webpin.desktop
+%{_prefix}/share/applications/YaST2/webpin.desktop
%changelog
++++++ yast2-packager-2.21.20.tar.bz2 -> yast2-packager-2.21.22.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-2.21.20/Makefile.am
new/yast2-packager-2.21.22/Makefile.am
--- old/yast2-packager-2.21.20/Makefile.am 2011-10-17 16:05:17.000000000
+0200
+++ new/yast2-packager-2.21.22/Makefile.am 2011-11-01 14:53:21.000000000
+0100
@@ -20,7 +20,6 @@
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
DEVTOOLS_DIR = $(if
$(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
-ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING
@@ -155,7 +154,7 @@
$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain
package-local
+package: check-up-to-date check-tagversion check-textdomain package-local
TAGVERSION = $(Y2TOOL) tagversion
@@ -185,21 +184,6 @@
check-parse:
@echo "Not running parseycp."
-check-all-packages:
- @if [ ! -e "$(ALL_PACKAGES)" ]; then \
- echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \
- fi
- @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then
\
- echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \
- fi
- @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some
unknown (?) fields:"; \
- echo; \
- grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \
- echo; \
- false; \
- fi
-
check-textdomain:
$(Y2TOOL) check-textdomain $(srcdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-2.21.20/Makefile.in
new/yast2-packager-2.21.22/Makefile.in
--- old/yast2-packager-2.21.20/Makefile.in 2011-10-17 16:05:20.000000000
+0200
+++ new/yast2-packager-2.21.22/Makefile.in 2011-11-01 14:53:24.000000000
+0100
@@ -261,7 +261,6 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
DEVTOOLS_DIR = $(if
$(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
-ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING
COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
@@ -902,7 +901,7 @@
$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain
package-local
+package: check-up-to-date check-tagversion check-textdomain package-local
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -930,21 +929,6 @@
check-parse:
@echo "Not running parseycp."
-check-all-packages:
- @if [ ! -e "$(ALL_PACKAGES)" ]; then \
- echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \
- fi
- @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then
\
- echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \
- fi
- @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some
unknown (?) fields:"; \
- echo; \
- grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \
- echo; \
- false; \
- fi
-
check-textdomain:
$(Y2TOOL) check-textdomain $(srcdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-2.21.20/VERSION
new/yast2-packager-2.21.22/VERSION
--- old/yast2-packager-2.21.20/VERSION 2011-10-17 16:03:22.000000000 +0200
+++ new/yast2-packager-2.21.22/VERSION 2011-11-01 14:52:34.000000000 +0100
@@ -1 +1 @@
-2.21.20
+2.21.22
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-2.21.20/configure
new/yast2-packager-2.21.22/configure
--- old/yast2-packager-2.21.20/configure 2011-10-17 16:05:19.000000000
+0200
+++ new/yast2-packager-2.21.22/configure 2011-11-01 14:53:24.000000000
+0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-packager 2.21.20.
+# Generated by GNU Autoconf 2.68 for yast2-packager 2.21.22.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.21.20'
-PACKAGE_STRING='yast2-packager 2.21.20'
+PACKAGE_VERSION='2.21.22'
+PACKAGE_STRING='yast2-packager 2.21.22'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1229,7 +1229,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.21.20 to adapt to many kinds of
systems.
+\`configure' configures yast2-packager 2.21.22 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1300,7 +1300,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.21.20:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.21.22:";;
esac
cat <<\_ACEOF
@@ -1380,7 +1380,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.21.20
+yast2-packager configure 2.21.22
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1397,7 +1397,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.21.20, which was
+It was created by yast2-packager $as_me 2.21.22, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2327,7 +2327,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.21.20'
+ VERSION='2.21.22'
cat >>confdefs.h <<_ACEOF
@@ -2449,7 +2449,7 @@
-VERSION="2.21.20"
+VERSION="2.21.22"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lsle...@suse.cz>"
@@ -3379,7 +3379,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.21.20, which was
+This file was extended by yast2-packager $as_me 2.21.22, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3432,7 +3432,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-packager config.status 2.21.20
+yast2-packager config.status 2.21.22
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-2.21.20/configure.in
new/yast2-packager-2.21.22/configure.in
--- old/yast2-packager-2.21.20/configure.in 2011-10-17 16:05:17.000000000
+0200
+++ new/yast2-packager-2.21.22/configure.in 2011-11-01 14:53:21.000000000
+0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
dnl
-dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.21.20, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.21.22, 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.21.20"
+VERSION="2.21.22"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lsle...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-2.21.20/packager.pot
new/yast2-packager-2.21.22/packager.pot
--- old/yast2-packager-2.21.20/packager.pot 1970-01-01 01:00:00.000000000
+0100
+++ new/yast2-packager-2.21.22/packager.pot 2008-09-10 10:47:12.000000000
+0200
@@ -0,0 +1,99 @@
+# translation of packager.po to
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Andrew Spackman <kiwili...@gmail.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: packager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-08-04 13:54+0200\n"
+"PO-Revision-Date: 2008-08-27 21:38+1200\n"
+"Last-Translator: Andrew Spackman <kiwili...@gmail.com>\n"
+"Language-Team: <e...@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#: src/clients/inst_packages.ycp:76
+msgid ""
+"<p>\n"
+"\t\t This dialog allows you to define this system's tasks and what software
to install.\n"
+"\t\t Available tasks and software for this system are shown by category in
the left\n"
+"\t\t column. To view a description for an item, select it in the list.\n"
+"\t\t </p>"
+msgstr ""
+"<p>\n"
+"\t\t This dialog allows you to define this system's tasks and the software
that has to be installed.\n"
+"\t\t Available tasks and software for this system are shown by category in
the left\n"
+"\t\t column. To view a description for an item, select it in the list.\n"
+"\t\t </p>"
+
+#. TRANSLATORS: dialog help
+#: src/clients/inst_productsources.ycp:600
+msgid ""
+"<p>Please wait while the packager is being initialized\n"
+"and the list of servers dowloaded from Web.</p>\n"
+msgstr ""
+"<p>Please wait while the packager is being initialized\n"
+"and the list of servers downloaded from the Web.</p>\n"
+
+#. help, continued
+#: src/clients/repositories.ycp:486
+msgid ""
+"<p>\n"
+"<b>Synchronize Changes with ZENworks</b> will call <tt>rug</tt>\n"
+"to also perform the changes in that package management system.</p>\n"
+msgstr ""
+"<p>\n"
+"<b>Synchronize Changes with ZENworks</b> will also call <tt>rug</tt>\n"
+"to perform the changes in that package management system.</p>\n"
+
+#: src/clients/webpin_package_search.ycp:223
+msgid ""
+"<p><big><b>Security</b></big><br>\n"
+"The software found is often not part of the distribution itself and the level
of trust\n"
+"depends on yourself. We do not take any responsibilities for installing\n"
+"such software.</p>"
+msgstr ""
+"<p><big><b>Security</b></big><br>\n"
+"The software found is often not part of the distribution itself and the level
of trust\n"
+"depends on yourself. We do not take any responsibility for installing\n"
+"such software.</p>"
+
+#. help text - media check 2/8
+#: src/include/checkmedia/ui.ycp:279
+msgid ""
+"<P>When you have a problem with\n"
+"the installation and are using a CD or DVD installation medium, you should
check\n"
+"whether the medium is broken.</P>\n"
+msgstr ""
+"<P>When you have a problem with\n"
+"the installation and you are using a CD or DVD installation medium, you
should check\n"
+"whether the medium is broken.</P>\n"
+
+#: src/include/checkmedia/ui.ycp:432
+msgid ""
+"The medium does not contain MD5 checksum.\n"
+"The content of the medium cannot be verified.\n"
+"\n"
+"Only readability of the medium will be checked."
+msgstr ""
+"The medium does not contain a MD5 checksum.\n"
+"The content of the medium cannot be verified.\n"
+"\n"
+"Only readability of the medium will be checked."
+
+#. (see bnc#178357 why these numbers)
+#. translators: help text for software proposal
+#: src/modules/Packages.ycp:302
+msgid "<P>The propsal contains total size of files which will be installed to
the system. However, the system will contain some other files (temporary and
working files) so the used space will be slighltly larger than the proposed
value. Therefore it is a good idea to have at least 25% (or 300MB) free space
before starting the installation.</P>"
+msgstr "<P>The propsal reports the total size of files which will be installed
to the system. However, the system will contain some other files (temporary and
working files) so the used space will be slighltly larger than the proposed
value. Therefore it is a good idea to have at least 25% (or 300MB) free space
before starting the installation.</P>"
+
+#. help text for software proposal
+#: src/modules/Packages.ycp:304
+msgid "<P>The total size to download is size of packages which will be
downloaded from remote (network) repositories. This value is important when the
connection is slow or when there is a data limit for downloading.</P>"
+msgstr ""
+"<P>The total 'size to download' is the size of the packages which will be
downloaded from remote (network) repositories.\n"
+" This value is important when the connection is slow or when there is a data
limit for downloading.</P>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-2.21.20/src/clients/pkg_finish.ycp
new/yast2-packager-2.21.22/src/clients/pkg_finish.ycp
--- old/yast2-packager-2.21.20/src/clients/pkg_finish.ycp 2011-08-04
11:14:12.000000000 +0200
+++ new/yast2-packager-2.21.22/src/clients/pkg_finish.ycp 2011-10-31
18:57:09.000000000 +0100
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain <jsr...@suse.cz>
*
- * $Id: pkg_finish.ycp 65153 2011-08-03 08:50:57Z lslezak $
+ * $Id: pkg_finish.ycp 66646 2011-10-31 17:57:08Z lslezak $
*
*/
@@ -139,12 +139,15 @@
WFM::call ("inst_extrasources");
}
- Pkg::SourceCacheCopyTo (Installation::destdir);
// save all repositories and finish target
Pkg::SourceSaveAll ();
Pkg::TargetFinish();
+ // save repository metadata cache to the installed system
+ // (needs to be done _after_ saving repositories, see bnc#700881)
+ Pkg::SourceCacheCopyTo (Installation::destdir);
+
// copy list of failed packages to installed system
WFM::Execute (.local.bash, sformat (
"test -f %1 && /bin/cp -a %1 '%2%1'",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-2.21.20/src/modules/SpaceCalculation.ycp
new/yast2-packager-2.21.22/src/modules/SpaceCalculation.ycp
--- old/yast2-packager-2.21.20/src/modules/SpaceCalculation.ycp 2011-08-31
16:33:53.000000000 +0200
+++ new/yast2-packager-2.21.22/src/modules/SpaceCalculation.ycp 2011-11-01
14:53:12.000000000 +0100
@@ -10,7 +10,7 @@
* on Installation::sourcedir
*
*
- * $Id: SpaceCalculation.ycp 65471 2011-08-31 12:55:07Z lslezak $
+ * $Id: SpaceCalculation.ycp 66654 2011-11-01 13:53:11Z lslezak $
*/
{
@@ -611,6 +611,13 @@
free_size = part["size_k"]:0 * 1024;
free_size = free_size - min_spare;
+ // free_size smaller than min_spare, fix negative
value
+ if (free_size < 0)
+ {
+ y2milestone("Fixing free size: %1 to 0",
free_size);
+ free_size = 0;
+ }
+
integer used = 0;
if (! (part["create"]:false ||
part["format"]:false))
{
@@ -714,6 +721,13 @@
// decrease free size
free_size = free_size - used;
+
+ // check for underflow
+ if (free_size < 0)
+ {
+ y2milestone("Fixing free size: %1 to 0",
free_size);
+ free_size = 0;
+ }
}
// convert into kB for TargetInitDU
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
