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, SuSE-Code-11-Branch has been updated
via 0fa59d87c876cd4d91d2effbed3a3fc7776d00d1 (commit)
via ffc4743acd5d86d56be7af9cec214f66831ba6fa (commit)
via 0850f9983af05e682ea1394a5d2f61254bb8f608 (commit)
via be690f9bef40b1562f902e7896b6182f664719ef (commit)
from ab5b0fe1ff0d82a714f06e8f5f367903597aee7a (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 0fa59d87c876cd4d91d2effbed3a3fc7776d00d1
Author: Ján Kupec
Date: Fri Jan 16 11:58:57 2009 +0100
changes
commit ffc4743acd5d86d56be7af9cec214f66831ba6fa
Author: Ján Kupec
Date: Thu Jan 15 12:04:43 2009 +0100
Commented out the unimplemented info-* commands for now (bnc #464384)
commit 0850f9983af05e682ea1394a5d2f61254bb8f608
Author: Ján Kupec
Date: Wed Jan 14 16:52:36 2009 +0100
changes
commit be690f9bef40b1562f902e7896b6182f664719ef
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 -----
VERSION.cmake | 2 +-
package/zypper.changes | 12 ++++++++++++
src/Command.cc | 16 ++++++++--------
src/Command.h | 18 +++++++++---------
src/solve-commit.cc | 8 +++++---
zypper.spec.cmake | 3 ---
7 files changed, 35 insertions(+), 29 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/VERSION.cmake b/VERSION.cmake
index 0cca84b..7dc1a7f 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -31,7 +31,7 @@
#
SET(VERSION_MAJOR "1")
SET(VERSION_MINOR "0")
-SET(VERSION_PATCH "4")
+SET(VERSION_PATCH "5")
# LAST RELEASED: 1.0.4
#=======
diff --git a/package/zypper.changes b/package/zypper.changes
index 73823d2..987e3f1 100644
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Thu Jan 15 12:14:44 CET 2009 - jkupec@suse.cz
+
+- Fixed 'unexpected program flow' message (bnc #464384)
+
+-------------------------------------------------------------------
+Wed Jan 14 16:50:52 CET 2009 - jkupec@suse.cz
+
+- check for SLE platform on runtime using base product name
+ instead of compile time (adapted fate #305057 - %suse_sles rpm
+ macro has been dropped).
+
+-------------------------------------------------------------------
Mon Jan 12 18:43:03 CET 2009 - jkupec@suse.cz
- translations update
diff --git a/src/Command.cc b/src/Command.cc
index 75f1a67..ea5c232 100644
--- a/src/Command.cc
+++ b/src/Command.cc
@@ -81,10 +81,10 @@ const ZypperCommand ZypperCommand::RUG_PRODUCT_INFO(ZypperCommand::RUG_PRODUCT_I
const ZypperCommand ZypperCommand::RUG_SERVICE_TYPES(ZypperCommand::RUG_SERVICE_TYPES_e);
const ZypperCommand ZypperCommand::RUG_LIST_RESOLVABLES(ZypperCommand::RUG_LIST_RESOLVABLES_e);
const ZypperCommand ZypperCommand::RUG_MOUNT(ZypperCommand::RUG_MOUNT_e);
-const ZypperCommand ZypperCommand::RUG_INFO_PROVIDES(ZypperCommand::RUG_INFO_PROVIDES_e);
-const ZypperCommand ZypperCommand::RUG_INFO_CONFLICTS(ZypperCommand::RUG_INFO_CONFLICTS_e);
-const ZypperCommand ZypperCommand::RUG_INFO_OBSOLETES(ZypperCommand::RUG_INFO_OBSOLETES_e);
-const ZypperCommand ZypperCommand::RUG_INFO_REQUIREMENTS(ZypperCommand::RUG_INFO_REQUIREMENTS_e);
+//const ZypperCommand ZypperCommand::RUG_INFO_PROVIDES(ZypperCommand::RUG_INFO_PROVIDES_e);
+//const ZypperCommand ZypperCommand::RUG_INFO_CONFLICTS(ZypperCommand::RUG_INFO_CONFLICTS_e);
+//const ZypperCommand ZypperCommand::RUG_INFO_OBSOLETES(ZypperCommand::RUG_INFO_OBSOLETES_e);
+//const ZypperCommand ZypperCommand::RUG_INFO_REQUIREMENTS(ZypperCommand::RUG_INFO_REQUIREMENTS_e);
const ZypperCommand ZypperCommand::RUG_PATCH_SEARCH(ZypperCommand::RUG_PATCH_SEARCH_e);
const ZypperCommand ZypperCommand::RUG_PING(ZypperCommand::RUG_PING_e);
@@ -158,10 +158,10 @@ ZypperCommand::Command ZypperCommand::parse(const std::string & strval_r)
_table["service-types"] = _table["st"] = ZypperCommand::RUG_SERVICE_TYPES_e;
_table["list-resolvables"] = /*_table["lr"] CONFLICT with repos =*/ ZypperCommand::RUG_LIST_RESOLVABLES_e;
_table["mount"] = ZypperCommand::RUG_MOUNT_e;
- _table["info-provides"] = _table["ip"] = ZypperCommand::RUG_INFO_PROVIDES_e;
- _table["info-requirements"] = _table["ir"] = ZypperCommand::RUG_INFO_REQUIREMENTS_e;
- _table["info-conflicts"] = _table["ic"] = ZypperCommand::RUG_INFO_CONFLICTS_e;
- _table["info-obsoletes"] = _table["io"] = ZypperCommand::RUG_INFO_OBSOLETES_e;
+ //_table["info-provides"] = _table["ip"] = ZypperCommand::RUG_INFO_PROVIDES_e;
+ //_table["info-requirements"] = _table["ir"] = ZypperCommand::RUG_INFO_REQUIREMENTS_e;
+ //_table["info-conflicts"] = _table["ic"] = ZypperCommand::RUG_INFO_CONFLICTS_e;
+ //_table["info-obsoletes"] = _table["io"] = ZypperCommand::RUG_INFO_OBSOLETES_e;
_table["patch-search"] = _table["pse"] = ZypperCommand::RUG_PATCH_SEARCH_e;
_table["ping"] = ZypperCommand::RUG_PING_e;
}
diff --git a/src/Command.h b/src/Command.h
index 5041e57..aa76c9e 100644
--- a/src/Command.h
+++ b/src/Command.h
@@ -36,7 +36,7 @@ struct ZypperCommand
static const ZypperCommand SRC_INSTALL;
static const ZypperCommand VERIFY;
static const ZypperCommand INSTALL_NEW_RECOMMENDS;
-
+
static const ZypperCommand UPDATE;
static const ZypperCommand LIST_UPDATES;
static const ZypperCommand PATCH;
@@ -58,7 +58,7 @@ struct ZypperCommand
static const ZypperCommand REMOVE_LOCK;
static const ZypperCommand LIST_LOCKS;
static const ZypperCommand CLEAN_LOCKS;
-
+
// utils/others
static const ZypperCommand TARGET_OS;
static const ZypperCommand VERSION_CMP;
@@ -80,10 +80,10 @@ struct ZypperCommand
static const ZypperCommand RUG_SERVICE_TYPES;
static const ZypperCommand RUG_LIST_RESOLVABLES;
static const ZypperCommand RUG_MOUNT;
- static const ZypperCommand RUG_INFO_PROVIDES;
- static const ZypperCommand RUG_INFO_CONFLICTS;
- static const ZypperCommand RUG_INFO_OBSOLETES;
- static const ZypperCommand RUG_INFO_REQUIREMENTS;
+ //static const ZypperCommand RUG_INFO_PROVIDES;
+ //static const ZypperCommand RUG_INFO_CONFLICTS;
+ //static const ZypperCommand RUG_INFO_OBSOLETES;
+ //static const ZypperCommand RUG_INFO_REQUIREMENTS;
static const ZypperCommand RUG_PATCH_SEARCH;
static const ZypperCommand RUG_PING;
//!@}
@@ -140,7 +140,7 @@ struct ZypperCommand
SHELL_e,
SHELL_QUIT_e,
MOO_e,
-
+
NONE_e,
RUG_PATCH_INFO_e,
@@ -160,7 +160,7 @@ struct ZypperCommand
ZypperCommand(Command command) : _command(command) {}
explicit ZypperCommand(const std::string & strval_r);
-
+
Command toEnum() const { return _command; }
ZypperCommand::Command parse(const std::string & strval_r);
@@ -168,7 +168,7 @@ struct ZypperCommand
const std::string & asString() const;
- Command _command;
+ Command _command;
};
/*
inline std::ostream & operator<<( std::ostream & str, const ZypperCommand & obj )
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