commit yast2-cd-creator

14 Dec 2006

Hello community,

here is the log from the commit of package yast2-cd-creator
checked in at Thu Dec 14 01:27:36 CET 2006.

--------

--- yast2-cd-creator/yast2-cd-creator.changes	2006-10-30 14:02:43.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-cd-creator/yast2-cd-creator.changes	2006-12-13 08:20:46.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Dec 13 07:43:06 CET 2006 - lslezak@suse.cz
+
+- display an error message when the selected source doesn't
+  support architecture of the machine (#197549)
+- 2.15.0
+
+-------------------------------------------------------------------

Old:
----
  yast2-cd-creator-2.14.0.tar.bz2

New:
----
  yast2-cd-creator-2.15.0.tar.bz2

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

Other differences:
------------------
++++++ yast2-cd-creator.spec ++++++
--- /var/tmp/diff_new_pack.BGOZl6/_old	2006-12-14 01:26:38.000000000 +0100
+++ /var/tmp/diff_new_pack.BGOZl6/_new	2006-12-14 01:26:38.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-cd-creator (Version 2.14.0)
+# spec file for package yast2-cd-creator (Version 2.15.0)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
 
 Name:           yast2-cd-creator
 URL:            http://www.suse.com/
-Version:        2.14.0
+Version:        2.15.0
 Release:        1
-License:        GNU General Public License (GPL) - all versions
+License:        GNU General Public License (GPL)
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-cd-creator-2.14.0.tar.bz2
+Source0:        yast2-cd-creator-2.15.0.tar.bz2
 prefix:		/usr
 BuildRequires:  autoyast2-installation perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-packager yast2-testsuite
 Requires:       yast2 yast2-packager autoyast2-installation
@@ -39,7 +39,7 @@
     Anas Nashif <nashif@suse.de>
 
 %prep
-%setup -n yast2-cd-creator-2.14.0
+%setup -n yast2-cd-creator-2.15.0
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,10 @@
 #%dir /etc/YaST2/cd-creator
 
 %changelog -n yast2-cd-creator
+* Wed Dec 13 2006 - lslezak@suse.cz
+- display an error message when the selected source doesn't
+  support architecture of the machine (#197549)
+- 2.15.0
 * Mon Oct 30 2006 - lslezak@suse.cz
 - 'create_package_descr' script has been moved to
   'inst-source-utils' package, install the right package (#213872)

++++++ yast2-cd-creator-2.14.0.tar.bz2 -> yast2-cd-creator-2.15.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/Makefile.am new/yast2-cd-creator-2.15.0/Makefile.am
--- old/yast2-cd-creator-2.14.0/Makefile.am	2006-10-30 13:59:39.000000000 +0100
+++ new/yast2-cd-creator-2.15.0/Makefile.am	2006-12-13 08:15:30.000000000 +0100
@@ -7,8 +7,7 @@
 #
 
 #where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
 
 VERSION			= $(shell cat $(srcdir)/VERSION)
 RPMNAME 		= $(shell cat $(srcdir)/RPMNAME)
@@ -20,7 +19,7 @@
 # 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,$(PREFIX)/share/YaST2/data/devtools)
+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)
 
@@ -34,7 +33,7 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2
 # where devtools instal m4 snippets
 # argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
 ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
 
 Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/Makefile.in new/yast2-cd-creator-2.15.0/Makefile.in
--- old/yast2-cd-creator-2.14.0/Makefile.in	2006-10-30 13:59:49.000000000 +0100
+++ new/yast2-cd-creator-2.15.0/Makefile.in	2006-12-13 08:15:38.000000000 +0100
@@ -135,6 +135,7 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = $(shell cat $(srcdir)/VERSION)
 XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
 YCPC = @YCPC@
 YCPDOC = @YCPDOC@
 YCPMAKEDEP = @YCPMAKEDEP@
@@ -201,15 +202,14 @@
 ystartupdir = @ystartupdir@
 
 #where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
 SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS      && echo SUBDIRS)
 ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4)
 HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE)
 
 # 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,$(PREFIX)/share/YaST2/data/devtools)
+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.english
@@ -220,7 +220,7 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2
 # where devtools instal m4 snippets
 # argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
 ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
 CLEANFILES = 
 MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/VERSION new/yast2-cd-creator-2.15.0/VERSION
--- old/yast2-cd-creator-2.14.0/VERSION	2006-10-30 13:53:25.000000000 +0100
+++ new/yast2-cd-creator-2.15.0/VERSION	2006-12-13 07:43:02.000000000 +0100
@@ -1 +1 @@
-2.14.0
+2.15.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/agents/Makefile.in new/yast2-cd-creator-2.15.0/agents/Makefile.in
--- old/yast2-cd-creator-2.14.0/agents/Makefile.in	2006-10-30 13:59:47.000000000 +0100
+++ new/yast2-cd-creator-2.15.0/agents/Makefile.in	2006-12-13 08:15:37.000000000 +0100
@@ -108,6 +108,7 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
 YCPC = @YCPC@
 YCPDOC = @YCPDOC@
 YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/configure new/yast2-cd-creator-2.15.0/configure
--- old/yast2-cd-creator-2.14.0/configure	2006-10-30 13:59:46.000000000 +0100
+++ new/yast2-cd-creator-2.15.0/configure	2006-12-13 08:15:35.000000000 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-cd-creator 2.14.0.
+# Generated by GNU Autoconf 2.60 for yast2-cd-creator 2.15.0.
 #
 # Report bugs to <http://bugs.opensuse.org/>.
 #
@@ -559,8 +559,8 @@
 # Identity of this package.
 PACKAGE_NAME='yast2-cd-creator'
 PACKAGE_TARNAME='yast2-cd-creator'
-PACKAGE_VERSION='2.14.0'
-PACKAGE_STRING='yast2-cd-creator 2.14.0'
+PACKAGE_VERSION='2.15.0'
+PACKAGE_STRING='yast2-cd-creator 2.15.0'
 PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
 
 ac_unique_file="RPMNAME"
@@ -659,6 +659,7 @@
 LN_S
 PKG_CONFIG_PATH
 XGETTEXT
+Y2DEVTOOLS_PREFIX
 CREATE_PKGCONFIG_TRUE
 CREATE_PKGCONFIG_FALSE
 CREATE_PKGCONFIG_NOARCH_TRUE
@@ -1180,7 +1181,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-cd-creator 2.14.0 to adapt to many kinds of systems.
+\`configure' configures yast2-cd-creator 2.15.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1251,7 +1252,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of yast2-cd-creator 2.14.0:";;
+     short | recursive ) echo "Configuration of yast2-cd-creator 2.15.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1329,7 +1330,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-yast2-cd-creator configure 2.14.0
+yast2-cd-creator configure 2.15.0
 generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1343,7 +1344,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-cd-creator $as_me 2.14.0, which was
+It was created by yast2-cd-creator $as_me 2.15.0, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
@@ -2144,7 +2145,7 @@
 
 # Define the identity of the package.
  PACKAGE='yast2-cd-creator'
- VERSION='2.14.0'
+ VERSION='2.15.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2371,7 +2372,7 @@
 
 
 
-VERSION="2.14.0"
+VERSION="2.15.0"
 RPMNAME="yast2-cd-creator"
 MAINTAINER="Ladislav Slezak <lslezak@suse.cz>"
 
@@ -2618,6 +2619,8 @@
    { (exit 1); exit 1; }; }
 fi
 
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+
 devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
 devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
 
@@ -2796,6 +2799,34 @@
 echo "$as_me: error: ycpc is not installed" >&2;}
    { (exit 1); exit 1; }; }
 fi
+as_ac_File=`echo "ac_cv_file_$devtools_yast2dir/data/testsuite/Makefile.testsuite" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite" >&5
+echo $ECHO_N "checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+if test -r "$devtools_yast2dir/data/testsuite/Makefile.testsuite"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+  :
+else
+
+    { echo "$as_me:$LINENO: WARNING: yast2-testsuite.rpm is not installed" >&5
+echo "$as_me: WARNING: yast2-testsuite.rpm is not installed" >&2;}
+
+fi
+
 
 
 ac_config_files="$ac_config_files Makefile agents/Makefile doc/autodocs/Makefile doc/Makefile scripts/Makefile src/data/Makefile src/Makefile testsuite/Makefile"
@@ -3227,7 +3258,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by yast2-cd-creator $as_me 2.14.0, which was
+This file was extended by yast2-cd-creator $as_me 2.15.0, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3270,7 +3301,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-yast2-cd-creator config.status 2.14.0
+yast2-cd-creator config.status 2.15.0
 configured by $0, generated by GNU Autoconf 2.60,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -3531,9 +3562,9 @@
 LN_S!$LN_S$ac_delim
 PKG_CONFIG_PATH!$PKG_CONFIG_PATH$ac_delim
 XGETTEXT!$XGETTEXT$ac_delim
+Y2DEVTOOLS_PREFIX!$Y2DEVTOOLS_PREFIX$ac_delim
 CREATE_PKGCONFIG_TRUE!$CREATE_PKGCONFIG_TRUE$ac_delim
 CREATE_PKGCONFIG_FALSE!$CREATE_PKGCONFIG_FALSE$ac_delim
-CREATE_PKGCONFIG_NOARCH_TRUE!$CREATE_PKGCONFIG_NOARCH_TRUE$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -3575,6 +3606,7 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+CREATE_PKGCONFIG_NOARCH_TRUE!$CREATE_PKGCONFIG_NOARCH_TRUE$ac_delim
 CREATE_PKGCONFIG_NOARCH_FALSE!$CREATE_PKGCONFIG_NOARCH_FALSE$ac_delim
 STYLESHEET_HTML!$STYLESHEET_HTML$ac_delim
 STYLESHEET_PDF!$STYLESHEET_PDF$ac_delim
@@ -3588,7 +3620,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; 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-cd-creator-2.14.0/configure.in new/yast2-cd-creator-2.15.0/configure.in
--- old/yast2-cd-creator-2.14.0/configure.in	2006-10-30 13:59:39.000000000 +0100
+++ new/yast2-cd-creator-2.15.0/configure.in	2006-12-13 08:15:29.000000000 +0100
@@ -1,9 +1,9 @@
 dnl configure.in for yast2-cd-creator
 dnl
-dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-cd-creator, 2.14.0, http://bugs.opensuse.org/, yast2-cd-creator)
+AC_INIT(yast2-cd-creator, 2.15.0, http://bugs.opensuse.org/, yast2-cd-creator)
 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.14.0"
+VERSION="2.15.0"
 RPMNAME="yast2-cd-creator"
 MAINTAINER="Ladislav Slezak <lslezak@suse.cz>"
 
@@ -110,6 +110,8 @@
     AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
 fi
 
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
 devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
 devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
 
@@ -142,6 +144,9 @@
 if test "$YCPC" = "false"; then
     AC_MSG_ERROR([ycpc is not installed])
 fi
+AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
+    AC_MSG_WARN([yast2-testsuite.rpm is not installed])
+])
 
 
 AC_CONFIG_FILES(Makefile agents/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/doc/Makefile.in new/yast2-cd-creator-2.15.0/doc/Makefile.in
--- old/yast2-cd-creator-2.14.0/doc/Makefile.in	2006-10-30 13:59:47.000000000 +0100
+++ new/yast2-cd-creator-2.15.0/doc/Makefile.in	2006-12-13 08:15:37.000000000 +0100
@@ -115,6 +115,7 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
 YCPC = @YCPC@
 YCPDOC = @YCPDOC@
 YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/doc/autodocs/Makefile.in new/yast2-cd-creator-2.15.0/doc/autodocs/Makefile.in
--- old/yast2-cd-creator-2.14.0/doc/autodocs/Makefile.in	2006-10-30 13:59:48.000000000 +0100
+++ new/yast2-cd-creator-2.15.0/doc/autodocs/Makefile.in	2006-12-13 08:15:37.000000000 +0100
@@ -105,6 +105,7 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
 YCPC = @YCPC@
 YCPDOC = @YCPDOC@
 YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/scripts/Makefile.in new/yast2-cd-creator-2.15.0/scripts/Makefile.in
--- old/yast2-cd-creator-2.14.0/scripts/Makefile.in	2006-10-30 13:59:48.000000000 +0100
+++ new/yast2-cd-creator-2.15.0/scripts/Makefile.in	2006-12-13 08:15:37.000000000 +0100
@@ -99,6 +99,7 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
 YCPC = @YCPC@
 YCPDOC = @YCPDOC@
 YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/src/Makefile.in new/yast2-cd-creator-2.15.0/src/Makefile.in
--- old/yast2-cd-creator-2.14.0/src/Makefile.in	2006-10-30 13:59:48.000000000 +0100
+++ new/yast2-cd-creator-2.15.0/src/Makefile.in	2006-12-13 08:15:37.000000000 +0100
@@ -121,6 +121,7 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
 YCPC = @YCPC@
 YCPDOC = @YCPDOC@
 YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/src/data/Makefile.in new/yast2-cd-creator-2.15.0/src/data/Makefile.in
--- old/yast2-cd-creator-2.14.0/src/data/Makefile.in	2006-10-30 13:59:48.000000000 +0100
+++ new/yast2-cd-creator-2.15.0/src/data/Makefile.in	2006-12-13 08:15:38.000000000 +0100
@@ -105,6 +105,7 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
 YCPC = @YCPC@
 YCPDOC = @YCPDOC@
 YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/src/dialogs.ycp new/yast2-cd-creator-2.15.0/src/dialogs.ycp
--- old/yast2-cd-creator-2.14.0/src/dialogs.ycp	2006-10-12 09:57:27.000000000 +0200
+++ new/yast2-cd-creator-2.15.0/src/dialogs.ycp	2006-12-13 08:08:33.000000000 +0100
@@ -4,7 +4,7 @@
  * Summary:	Dialogs definitions
  * Authors:	Anas Nashif <nashif@suse.de>
  *
- * $Id: dialogs.ycp 33333 2006-10-12 07:57:25Z lslezak $
+ * $Id: dialogs.ycp 34926 2006-12-13 07:08:31Z lslezak $
  */
 
 {
@@ -19,6 +19,7 @@
     import "StorageDevices";
     import "Arch";
     import "Label";
+    import "URL";
 
     include "cd-creator/helps.ycp";
 
@@ -486,12 +487,40 @@
             {
                 integer SrcID = (integer)UI::QueryWidget(`id(`table), `CurrentItem);
 
-		if (!contains(selected_items, SrcID))
+		// Check architecture
+		map general = Pkg::SourceGeneralData(SrcID);
+		string source_path = URL::Parse(general["url"]:"")["path"]:"";
+		y2internal("source_path: %1", source_path);
+
+		map<string,string> read_content = (map<string,string>)SCR::Read(.content_file, source_path + "/content");
+		y2internal("Read content files: %1", read_content);
+
+		boolean found_architecture = false;
+		foreach(string key, string value, read_content,
+		    {
+			if (key == "ARCH." + Arch::architecture())
+			{
+			    found_architecture = true;
+			    break;
+			}
+		    }
+		);
+
+		y2milestone("Architecture %1 is supported: %2", Arch::architecture(), found_architecture);
+
+		if (found_architecture)
 		{
-		    selected_items = add (selected_items, SrcID );
-		}
+		    if (!contains(selected_items, SrcID))
+		    {
+			selected_items = add (selected_items, SrcID );
+		    }
 
-                UI::ChangeWidget(`id(`table), `Item(SrcID, 0) , _("X"));
+		    UI::ChangeWidget(`id(`table), `Item(SrcID, 0) , _("X"));
+		}
+		else
+		{
+		    Report::Error(sformat(_("The source does not support architecture of this machine (%1).\nSelect another source."), Arch::architecture()));
+		}
             }
             else if (ret == `remove)
             {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/testsuite/Makefile.in new/yast2-cd-creator-2.15.0/testsuite/Makefile.in
--- old/yast2-cd-creator-2.14.0/testsuite/Makefile.in	2006-10-30 13:59:48.000000000 +0100
+++ new/yast2-cd-creator-2.15.0/testsuite/Makefile.in	2006-12-13 08:15:38.000000000 +0100
@@ -101,6 +101,7 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
 YCPC = @YCPC@
 YCPDOC = @YCPDOC@
 YCPMAKEDEP = @YCPMAKEDEP@


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



Remember to have fun...

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

    

root＠suse.de

tags

participants (1)