Hello community,
here is the log from the commit of package zypper
checked in at Mon Nov 13 17:58:19 CET 2006.
--------
--- zypper/zypper.changes 2006-11-10 12:57:42.000000000 +0100
+++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2006-11-13 15:48:34.000000000 +0100
@@ -1,0 +2,12 @@
+Mon Nov 13 15:47:50 CET 2006 - mvidner@suse.cz
+
+- Fixed service-rename leaving the old name around.
+- 0.6.9
+
+-------------------------------------------------------------------
+Mon Nov 13 14:07:59 CET 2006 - jkupec@suse.cz
+
+- license confirmation upon installation/update added
+- 0.6.8
+
+-------------------------------------------------------------------
Old:
----
zypper-0.6.7.tar.bz2
New:
----
zypper-0.6.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zypper.spec ++++++
--- /var/tmp/diff_new_pack.2yYZ1J/_old 2006-11-13 17:57:55.000000000 +0100
+++ /var/tmp/diff_new_pack.2yYZ1J/_new 2006-11-13 17:57:55.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package zypper (Version 0.6.7)
+# spec file for package zypper (Version 0.6.9)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -21,9 +21,9 @@
Autoreqprov: on
PreReq: permissions
Summary: Command Line Package Management Using Libzypp
-Version: 0.6.7
+Version: 0.6.9
Release: 1
-Source: zypper-0.6.7.tar.bz2
+Source: zypper-0.6.9.tar.bz2
Prefix: /usr
# zypper is not a fully featured replacement yet
#Provides: y2pmsh
@@ -91,6 +91,12 @@
%doc %{_datadir}/doc/packages/zypper/zypper-rug
%changelog -n zypper
+* Mon Nov 13 2006 - mvidner@suse.cz
+- Fixed service-rename leaving the old name around.
+- 0.6.9
+* Mon Nov 13 2006 - jkupec@suse.cz
+- license confirmation upon installation/update added
+- 0.6.8
* Fri Nov 10 2006 - jkupec@suse.cz
- solve_and_commit() changed to return informative exit codes if
a reboot or package manager restart is needed after
++++++ zypper-0.6.7.tar.bz2 -> zypper-0.6.9.tar.bz2 ++++++
++++ 13729 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zypper-0.6.7/ChangeLog new/zypper-0.6.9/ChangeLog
--- old/zypper-0.6.7/ChangeLog 2006-11-09 08:16:36.000000000 +0100
+++ new/zypper-0.6.9/ChangeLog 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-2006-11-09 gettextize
-
- * Makefile.am (EXTRA_DIST): Add m4/ChangeLog.
-
-2006-10-25 gettextize
-
- * Makefile.am (EXTRA_DIST): Add config.rpath, mkinstalldirs, m4/ChangeLog.
- * configure.ac (AC_OUTPUT): Add po/Makefile.in.
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zypper-0.6.7/VERSION new/zypper-0.6.9/VERSION
--- old/zypper-0.6.7/VERSION 2006-11-10 12:08:07.000000000 +0100
+++ new/zypper-0.6.9/VERSION 2006-11-13 15:49:29.000000000 +0100
@@ -10,5 +10,5 @@
dnl ==================================================
m4_define([ZYPPER_MAJOR], [0])
m4_define([ZYPPER_MINOR], [6])
-m4_define([ZYPPER_PATCH], [7])
+m4_define([ZYPPER_PATCH], [9])
dnl ==================================================
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zypper-0.6.7/doc/TODO new/zypper-0.6.9/doc/TODO
--- old/zypper-0.6.7/doc/TODO 2006-11-09 17:00:36.000000000 +0100
+++ new/zypper-0.6.9/doc/TODO 2006-11-13 15:48:46.000000000 +0100
@@ -5,7 +5,9 @@
- script progress: does the output contain newline??
- installation and deletion notifications
- --dry-run (use ZYppCommitPolicy.h)
-- FIXME zypper service-rename creates duplicates in sources list
+- confirm license: more user friendly (see confirm_licenses() comment)
+- FIXME zypper search ignores target packages that were not installed
+ from sources
Patches
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zypper-0.6.7/doc/zypper.8 new/zypper-0.6.9/doc/zypper.8
--- old/zypper-0.6.7/doc/zypper.8 2006-11-08 20:06:13.000000000 +0100
+++ new/zypper-0.6.9/doc/zypper.8 2006-11-13 15:48:59.000000000 +0100
@@ -202,7 +202,6 @@
.TP
.B service-rename (sr) <new-alias>
Rename a service (installation source).
-BUG: the old name is not removed and shares a cache - danger!
.TP
.B refresh (ref)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zypper-0.6.7/po/ChangeLog new/zypper-0.6.9/po/ChangeLog
--- old/zypper-0.6.7/po/ChangeLog 2006-10-25 14:19:44.000000000 +0200
+++ new/zypper-0.6.9/po/ChangeLog 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-2006-10-25 gettextize
-
- * Makefile.in.in: New file, from gettext-0.14.5.
- * boldquot.sed: New file, from gettext-0.14.5.
- * en@boldquot.header: New file, from gettext-0.14.5.
- * en@quot.header: New file, from gettext-0.14.5.
- * insert-header.sin: New file, from gettext-0.14.5.
- * quot.sed: New file, from gettext-0.14.5.
- * remove-potcdate.sin: New file, from gettext-0.14.5.
- * Rules-quot: New file, from gettext-0.14.5.
-
Binary files old/zypper-0.6.7/po/cs.gmo and new/zypper-0.6.9/po/cs.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zypper-0.6.7/po/cs.po new/zypper-0.6.9/po/cs.po
--- old/zypper-0.6.7/po/cs.po 2006-11-10 12:39:38.000000000 +0100
+++ new/zypper-0.6.9/po/cs.po 2006-11-05 23:06:24.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: zypper 0.5.0\n"
"Report-Msgid-Bugs-To: translation@suse.de\n"
-"POT-Creation-Date: 2006-11-10 12:39+0100\n"
+"POT-Creation-Date: 2006-11-05 23:06+0100\n"
"PO-Revision-Date: 2006-10-25 09:22+0200\n"
"Last-Translator: Martin Vidner \n"
"Language-Team: Czech \n"
@@ -37,7 +37,7 @@
"\tpatch-info\t\tShow full info for patches\n"
msgstr ""
-#: src/zypper.cc:294
+#: src/zypper.cc:256
msgid ""
"zypper refresh\n"
"\n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zypper-0.6.7/src/zmart-misc.cc new/zypper-0.6.9/src/zmart-misc.cc
--- old/zypper-0.6.7/src/zmart-misc.cc 2006-11-09 18:33:38.000000000 +0100
+++ new/zypper-0.6.9/src/zmart-misc.cc 2006-11-13 14:46:10.000000000 +0100
@@ -34,6 +34,7 @@
}
// return the default value on input failure
+// TODO make this locale dependent?
bool read_bool_with_default (bool defval) {
istream & stm = cin;
@@ -622,12 +623,16 @@
show_problems ();
+
// returns -1, 0, ZYPPER_EXIT_INF_REBOOT_NEEDED, or ZYPPER_EXIT_INF_RESTART_NEEDED
int retv = show_summary();
if (retv >= 0) { // there are resolvables to install/uninstall
cerr << "Continue? [y/n] " << (non_interactive ? "y\n" : "");
if (non_interactive || readBoolAnswer()) {
+
+ if (!confirm_licenses(non_interactive)) return ZYPPER_EXIT_OK;
+
cerr_v << "committing" << endl;
ZYppCommitResult result = God->commit( ZYppCommitPolicy() );
if (!result._errors.empty())
@@ -639,16 +644,69 @@
if (retv < 0)
retv = ZYPPER_EXIT_OK;
else if (retv == ZYPPER_EXIT_INF_REBOOT_NEEDED)
- cout << "WARNING: One of installed patches requires reboot of"
- " your machine. Please, do it as soon as possible." << endl;
+ cout << _("WARNING: One of installed patches requires reboot of"
+ " your machine. Please, do it as soon as possible.") << endl;
else if (retv == ZYPPER_EXIT_INF_RESTART_NEEDED)
- cout << "WARNING: One of installed patches affects the package"
+ cout << _("WARNING: One of installed patches affects the package"
" manager itself, thus it requires restart before executing"
- " next operations." << endl;
+ " next operations.") << endl;
return retv;
}
+// TODO
+// - make this more user-friendly e.g. show only license name and
+// ask for [y/n/r] with 'r' for read the license text
+// (opened throu more or less, etc...)
+// - after negative answer, call solve_and_commit() again
+bool confirm_licenses(bool non_interactive)
+{
+ bool confirmed = true;
+
+ for (ResPool::const_iterator it = God->pool().begin(); it != God->pool().end(); ++it)
+ {
+ if (it->status().isToBeInstalled() &&
+ !it->resolvable()->licenseToConfirm().empty())
+ {
+ cout << it->resolvable()->name() << " " <<
+ it->resolvable()->kind().asString() <<
+ " " << _("license") << ": " <<
+ it->resolvable()->licenseToConfirm() << endl;
+
+ cout << _("In order to install this package, you must agree"
+ " to terms of the above licencse. Continue?") << " [y/n] " <<
+ (non_interactive ? "n\n" : "");
+
+ if (non_interactive || !readBoolAnswer())
+ {
+ confirmed = false;
+
+ if (non_interactive)
+ {
+ cout << endl <<
+ _("Aborting installation due to the need of"
+ " license(s) confirmation.") <<
+ " " << _("Please, restart the operation in interactive"
+ " mode and confirm agreement with required license(s).")
+ << endl;
+ }
+ else
+ {
+ cout << endl <<
+ _("Aborting installation due to user disagreement"
+ " with ") << it->resolvable()->name() << " " <<
+ it->resolvable()->kind().asString() <<
+ " " << _("license") << "." << endl;
+ }
+
+ break;
+ }
+ }
+ }
+
+ return confirmed;
+}
+
// Local Variables:
// c-basic-offset: 2
// End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zypper-0.6.7/src/zmart-misc.h new/zypper-0.6.9/src/zmart-misc.h
--- old/zypper-0.6.7/src/zmart-misc.h 2006-11-09 14:22:06.000000000 +0100
+++ new/zypper-0.6.9/src/zmart-misc.h 2006-11-13 14:46:10.000000000 +0100
@@ -39,6 +39,7 @@
void mark_updates( const zypp::ResObject::Kind &kind );
void usage(int argc, char **argv);
int solve_and_commit (bool non_interactive = false);
+bool confirm_licenses(bool non_interactive = false);
// copied from yast2-pkg-bindings:PkgModuleFunctions::DoProvideNameKind
struct ProvideProcess
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zypper-0.6.7/src/zmart-sources.cc new/zypper-0.6.9/src/zmart-sources.cc
--- old/zypper-0.6.7/src/zmart-sources.cc 2006-11-05 23:59:17.000000000 +0100
+++ new/zypper-0.6.9/src/zmart-sources.cc 2006-11-13 15:40:53.000000000 +0100
@@ -381,6 +381,10 @@
//! rename a source, identified in any way: alias, url, id
void rename_source( const std::string& anystring, const std::string& newalias )
{
+#ifdef LIBZYPP_1xx
+ // renameSource is recent
+ cerr << "Sorry, not implemented yet for libzypp-1.x.x" << endl;
+#else
cerr_vv << "Constructing SourceManager" << endl;
SourceManager_Ptr manager = SourceManager::sourceManager();
cerr_vv << "Restoring SourceManager" << endl;
@@ -437,11 +441,13 @@
}
if (src) {
- src.setAlias (newalias);
+ // getting Source_Ref is useless if we only can use an id
+ manager->renameSource (src.numericId (), newalias);
}
cerr_vv << "Storing source data" << endl;
manager->store( "/", true /*metadata_cache*/ );
+#endif
}
void refresh_sources()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zypper-0.6.7/src/zmart.cc new/zypper-0.6.9/src/zmart.cc
--- old/zypper-0.6.7/src/zmart.cc 2006-11-04 15:17:51.000000000 +0100
+++ new/zypper-0.6.9/src/zmart.cc 2006-11-13 14:46:10.000000000 +0100
@@ -203,6 +203,13 @@
return -1;
}
+ #ifdef LIBZYPP_1xx
+ // dont add rpms
+ God->initTarget("/", true);
+#else
+ God->initializeTarget("/");
+#endif
+
SourceManager_Ptr manager;
manager = SourceManager::sourceManager();
@@ -224,13 +231,6 @@
cout << "Warning! No sources. Operating only over the installed resolvables. You will not be able to install stuff" << endl;
}
-#ifdef LIBZYPP_1xx
- // dont add rpms
- God->initTarget("/", true);
-#else
- God->initializeTarget("/");
-#endif
-
std::string token = calculate_token();
if ( token != gSettings.previous_token )
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org