This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "ZYpp based command line package management tool".
The branch, master has been updated
via 48ad2317aeda5c19d2b77739b6ecf282d962570f (commit)
via 78f9512ff942f1fc48d54319f4d45f0b992f77be (commit)
from 29df730aea08e649879a74c85932d8aba9a54ee4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 48ad2317aeda5c19d2b77739b6ecf282d962570f
Author: Ján Kupec
Date: Wed Jan 14 16:48:44 2009 +0100
changes
commit 78f9512ff942f1fc48d54319f4d45f0b992f77be
Author: Ján Kupec
Date: Wed Jan 14 16:26:05 2009 +0100
Check if we run SLE on runtime based on installed base product name.
This adapts fate #305057 to check the platform on runtime instead
of a compile-time check based on %suse_sles rpm macro. Zypper will
consider the system a SLE if there's a base product having "SUSE_SLE"
in its name.
-----------------------------------------------------------------------
Summary of changes and diff:
CMakeLists.txt | 5 -----
package/zypper.changes | 6 ++++++
src/solve-commit.cc | 8 +++++---
zypper.spec.cmake | 3 ---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d15e65..b8a52bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,11 +42,6 @@ ELSE( READLINE_FOUND )
MESSAGE( FATAL_ERROR "readline not found" )
ENDIF( READLINE_FOUND )
-IF( ZYPPER_CONFIRM_UNSUPPORTED_PACKAGES )
- ADD_DEFINITIONS( -DZYPPER_CONFIRM_UNSUPPORTED_PACKAGES )
-ENDIF( ZYPPER_CONFIRM_UNSUPPORTED_PACKAGES )
-
-
ADD_SUBDIRECTORY( src )
ADD_SUBDIRECTORY( po )
ADD_SUBDIRECTORY( doc )
diff --git a/package/zypper.changes b/package/zypper.changes
index 249a801..7c5d00f 100644
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Jan 14 16:47:05 CET 2009 - jkupec@suse.cz
+
+- check for SLE platform on runtime using base product name
+ instead of compile time (adapted fate #305057)
+
+-------------------------------------------------------------------
Wed Jan 14 09:59:22 CET 2009 - jkupec@suse.cz
- modifyrepo - accept multiple arguments
diff --git a/src/solve-commit.cc b/src/solve-commit.cc
index 5126345..aa25bb1 100755
--- a/src/solve-commit.cc
+++ b/src/solve-commit.cc
@@ -748,9 +748,11 @@ static int summary(Zypper & zypper)
show_summary_of_type(zypper, TO_REMOVE, toremove);
show_summary_of_type(zypper, TO_CHANGE_ARCH, tochangearch);
show_summary_of_type(zypper, TO_CHANGE_VENDOR, tochangevendor);
-#ifdef ZYPPER_CONFIRM_UNSUPPORTED_PACKAGES
- show_summary_of_type(zypper, UNSUPPORTED, tounsupported);
-#endif
+ // if running on SUSE Linux Enterprise, report unsupported packages
+ Product::constPtr platform = God->target()->baseProduct();
+ if (platform && platform->name().find("SUSE_SLE") != string::npos)
+ show_summary_of_type(zypper, UNSUPPORTED, tounsupported);
+
// "</install-summary>"
if (zypper.out().type() == Out::TYPE_XML)
cout << "</install-summary>" << endl;
diff --git a/zypper.spec.cmake b/zypper.spec.cmake
index ce25e9f..6b8592b 100644
--- a/zypper.spec.cmake
+++ b/zypper.spec.cmake
@@ -46,9 +46,6 @@ Authors:
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \
-%if 0%{?sles_version}
- -DZYPPER_CONFIRM_UNSUPPORTED_PACKAGES \
-%endif
-DSYSCONFDIR=%{_sysconfdir} \
-DMANDIR=%{_mandir} \
-DCMAKE_VERBOSE_MAKEFILE=TRUE \
hooks/post-receive
--
ZYpp based command line package management tool
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org