Hello community,
here is the log from the commit of package yast2-product-creator
checked in at Tue Nov 18 14:19:45 CET 2008.
--------
--- yast2-product-creator/yast2-product-creator.changes 2008-10-31 21:01:22.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-product-creator/yast2-product-creator.changes 2008-11-18 00:13:28.961098000 +0100
@@ -1,0 +2,6 @@
+Tue Nov 11 17:11:36 CET 2008 - lslezak@suse.cz
+
+- fixed architecture check of CODE11 repositories (bnc#438732)
+- 2.17.12
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-product-creator-2.17.11.tar.bz2
New:
----
yast2-product-creator-2.17.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.Bh4341/_old 2008-11-18 14:18:16.000000000 +0100
+++ /var/tmp/diff_new_pack.Bh4341/_new 2008-11-18 14:18:16.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-product-creator (Version 2.17.11)
+# spec file for package yast2-product-creator (Version 2.17.12)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-product-creator
-Version: 2.17.11
+Version: 2.17.12
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.17.11.tar.bz2
+Source0: yast2-product-creator-2.17.12.tar.bz2
Prefix: /usr
BuildRequires: autoyast2-installation perl-XML-Writer update-desktop-files yast2 yast2-add-on-creator yast2-devtools yast2-packager yast2-security yast2-testsuite
PreReq: %fillup_prereq
@@ -49,7 +49,7 @@
%prep
-%setup -n yast2-product-creator-2.17.11
+%setup -n yast2-product-creator-2.17.12
%build
%{prefix}/bin/y2tool y2autoconf
@@ -94,7 +94,11 @@
#%dir /etc/YaST2/product-creator
/usr/share/YaST2/scrconf/*.scr
/var/adm/fillup-templates/sysconfig.product-creator
+
%changelog
+* Tue Nov 11 2008 lslezak@suse.cz
+- fixed architecture check of CODE11 repositories (bnc#438732)
+- 2.17.12
* Fri Oct 31 2008 jsuchome@suse.cz
- image-creator template: install pattern packages by default
(bnc#404022)
++++++ yast2-product-creator-2.17.11.tar.bz2 -> yast2-product-creator-2.17.12.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.11/configure new/yast2-product-creator-2.17.12/configure
--- old/yast2-product-creator-2.17.11/configure 2008-10-31 13:28:19.000000000 +0100
+++ new/yast2-product-creator-2.17.12/configure 2008-11-12 17:35:31.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-product-creator 2.17.10.
+# Generated by GNU Autoconf 2.63 for yast2-product-creator 2.17.12.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-product-creator'
PACKAGE_TARNAME='yast2-product-creator'
-PACKAGE_VERSION='2.17.10'
-PACKAGE_STRING='yast2-product-creator 2.17.10'
+PACKAGE_VERSION='2.17.12'
+PACKAGE_STRING='yast2-product-creator 2.17.12'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1274,7 +1274,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-product-creator 2.17.10 to adapt to many kinds of systems.
+\`configure' configures yast2-product-creator 2.17.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1346,7 +1346,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-product-creator 2.17.10:";;
+ short | recursive ) echo "Configuration of yast2-product-creator 2.17.12:";;
esac
cat <<\_ACEOF
@@ -1426,7 +1426,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-product-creator configure 2.17.10
+yast2-product-creator configure 2.17.12
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1440,7 +1440,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-product-creator $as_me 2.17.10, which was
+It was created by yast2-product-creator $as_me 2.17.12, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2287,7 +2287,7 @@
# Define the identity of the package.
PACKAGE='yast2-product-creator'
- VERSION='2.17.10'
+ VERSION='2.17.12'
cat >>confdefs.h <<_ACEOF
@@ -2511,7 +2511,7 @@
-VERSION="2.17.10"
+VERSION="2.17.12"
RPMNAME="yast2-product-creator"
MAINTAINER="Ladislav Slezak "
@@ -3452,7 +3452,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-product-creator $as_me 2.17.10, which was
+This file was extended by yast2-product-creator $as_me 2.17.12, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3502,7 +3502,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-product-creator config.status 2.17.10
+yast2-product-creator config.status 2.17.12
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.11/configure.in new/yast2-product-creator-2.17.12/configure.in
--- old/yast2-product-creator-2.17.11/configure.in 2008-10-31 13:28:15.000000000 +0100
+++ new/yast2-product-creator-2.17.12/configure.in 2008-11-12 17:35:26.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-product-creator, 2.17.10, http://bugs.opensuse.org/, yast2-product-creator)
+AC_INIT(yast2-product-creator, 2.17.12, http://bugs.opensuse.org/, yast2-product-creator)
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.10"
+VERSION="2.17.12"
RPMNAME="yast2-product-creator"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.11/src/dialogs.ycp new/yast2-product-creator-2.17.12/src/dialogs.ycp
--- old/yast2-product-creator-2.17.11/src/dialogs.ycp 2008-10-31 20:03:36.000000000 +0100
+++ new/yast2-product-creator-2.17.12/src/dialogs.ycp 2008-11-11 17:56:21.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Anas Nashif
*
- * $Id: dialogs.ycp 52803 2008-10-31 15:22:26Z lslezak $
+ * $Id: dialogs.ycp 53182 2008-11-11 16:53:29Z lslezak $
*/
{
@@ -515,14 +515,30 @@
boolean CheckArchitecture(integer SrcID)
{
map general_info = Pkg::SourceGeneralData(SrcID);
+ y2milestone("Checking architecture of repository %1", general_info);
boolean found_architecture = false;
list<string> found_archs = [];
- string arch = ProductCreator::GetArch();
+ string arch = ProductCreator::GetPackageArch();
+
+ if (arch == nil)
+ {
+ arch = ProductCreator::GetArch();
+ }
+
if (arch == "s390_64") arch = "s390x";
+ string type = general_info["type"]:"";
+
+ // if the type is missing then probe it now
+ if (type == "NONE")
+ {
+ type = Pkg::RepositoryProbe(general_info["url"]:"", general_info["product_dir"]:"/");
+ y2milestone("Probed repository type: %1", type);
+ }
+
// architecture check is possible only for YaST sources
- if (general_info["type"]:"" == "YaST")
+ if (type == "YaST")
{
// Check architecture
map read_content = ProductCreator::ReadContentFile(SrcID);
@@ -535,6 +551,23 @@
found_architecture = true;
break;
}
+ if (key == "BASEARCHS")
+ {
+ y2milestone("BASEARCHS: %1", value);
+ list<string> arch_list = splitstring(value, " ");
+ arch_list = filter(string a, arch_list, {return a != nil && a != "";});
+ y2milestone("Found architectures: %1", arch_list);
+
+ if (contains(arch_list, arch))
+ {
+ found_architecture = true;
+ break;
+ }
+ else
+ {
+ found_archs = (list<string>)union(found_archs, arch_list);
+ }
+ }
else
{
string found_arch = regexpsub(key, "ARCH\\.(.*)", "\\1");
@@ -760,7 +793,7 @@
if (arch != nil)
{
- y2milestone("Target architecture has been changed");
+ y2milestone("Target architecture has been changed to %1", arch);
ProductCreator::Config["arch"] = arch;
boolean check_ok = true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.11/src/kiwi_dialogs.ycp new/yast2-product-creator-2.17.12/src/kiwi_dialogs.ycp
--- old/yast2-product-creator-2.17.11/src/kiwi_dialogs.ycp 2008-10-31 14:27:41.000000000 +0100
+++ new/yast2-product-creator-2.17.12/src/kiwi_dialogs.ycp 2008-11-03 13:52:46.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs for kiwi configuration
* Authors: Jiri Suchomel
*
- * $Id: kiwi_dialogs.ycp 52213 2008-10-15 08:43:57Z jsuchome $
+ * $Id: kiwi_dialogs.ycp 52822 2008-11-03 09:31:53Z jsuchome $
*/
{
textdomain "product-creator";
@@ -13,8 +13,9 @@
import "CWMTab";
import "Directory";
import "FileUtils";
- import "Label";
import "Kiwi";
+ import "Label";
+ import "Message";
import "Package";
import "PackageSystem";
import "Popup";
@@ -2369,6 +2370,7 @@
}
if (to_install != "" && !Package::Install (to_install))
{
+ Popup::Error (Message::FailedToInstallPackages ());
continue;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.11/src/ProductCreator.ycp new/yast2-product-creator-2.17.12/src/ProductCreator.ycp
--- old/yast2-product-creator-2.17.11/src/ProductCreator.ycp 2008-10-31 20:03:36.000000000 +0100
+++ new/yast2-product-creator-2.17.12/src/ProductCreator.ycp 2008-11-12 13:33:34.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Data for configuration of product-creator, input and output functions.
* Authors: Anas Nashif
*
- * $Id: ProductCreator.ycp 52793 2008-10-31 13:07:48Z lslezak $
+ * $Id: ProductCreator.ycp 53195 2008-11-12 12:30:34Z lslezak $
*
* Representation of the configuration of product-creator.
* Input and output routines.
@@ -2003,6 +2003,9 @@
if (gpg_key == "")
{
+ // remove the old file before unpacking
+ ret = Exec(sformat("rm -rf '%1/linuxrc.config'", String::Quote(base)));
+
// unpack 'linuxrc.config' file
ret = Exec(sformat("cd '%1' && cpio -i -H newc -F '%2.cpio' linuxrc.config",
String::Quote(base), String::Quote(initrd_file)));
@@ -2011,6 +2014,7 @@
// add 'Insecure: 1' option
ret = Exec(sformat("cd '%1' && echo 'Insecure:\t1' >> linuxrc.config", String::Quote(base)));
if (!ret) return false;
+ y2milestone("Updated linuxrc.config: %1", SCR::Read(.target.string, base + "/linuxrc.config"));
// add linuxrc instead of a gpg key
new_file = "linuxrc.config";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.11/VERSION new/yast2-product-creator-2.17.12/VERSION
--- old/yast2-product-creator-2.17.11/VERSION 2008-10-31 20:03:33.000000000 +0100
+++ new/yast2-product-creator-2.17.12/VERSION 2008-11-12 16:35:11.000000000 +0100
@@ -1 +1 @@
-2.17.11
+2.17.12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org