Hello community,
here is the log from the commit of package zypper
checked in at Mon Sep 3 18:49:33 CEST 2007.
--------
--- zypper/zypper.changes 2007-08-31 16:08:44.000000000 +0200
+++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2007-09-03 17:34:34.486548000 +0200
@@ -1,0 +2,25 @@
+Mon Sep 3 17:32:33 CEST 2007 - jkupec@suse.cz
+
+- fix broken compiler flags (schwab)
+- r7099
+- 0.8.19
+
+-------------------------------------------------------------------
+Mon Sep 3 17:09:00 CEST 2007 - jkupec@suse.cz
+
+- authentication prompt implemented (#190609)
+- LOCK documention added to man page (mvidner)
+- r7093
+
+-------------------------------------------------------------------
+Mon Sep 3 14:15:59 CEST 2007 - jkupec@suse.cz
+
+- removing rpm message improved (#307132)
+- r7086
+
+-------------------------------------------------------------------
+Mon Sep 3 12:34:35 CEST 2007 - kkaempf@suse.de
+
+- make (r)etry (c)ancel answer case-insensitive (#307122)
+
+-------------------------------------------------------------------
Old:
----
zypper-0.8.18.tar.bz2
New:
----
zypper-0.8.19.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zypper.spec ++++++
--- /var/tmp/diff_new_pack.L17612/_old 2007-09-03 18:49:18.000000000 +0200
+++ /var/tmp/diff_new_pack.L17612/_new 2007-09-03 18:49:18.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package zypper (Version 0.8.18)
+# spec file for package zypper (Version 0.8.19)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,9 +20,9 @@
Autoreqprov: on
PreReq: permissions
Summary: Command Line Package Management Using Libzypp
-Version: 0.8.18
-Release: 2
-Source: zypper-0.8.18.tar.bz2
+Version: 0.8.19
+Release: 1
+Source: zypper-0.8.19.tar.bz2
Prefix: /usr
URL: http://en.opensuse.org/Zypper
Provides: y2pmsh
@@ -48,8 +48,9 @@
cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \
-DSYSCONFDIR=%{_sysconfdir} \
-DMANDIR=%{_mandir} \
- -DCMAKE_C_FLAGS="%{optflags}" \
- -DCMAKE_CXX_FLAGS="%{optflags}" \
+ -DCMAKE_VERBOSE_MAKEFILE=TRUE \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \
-DCMAKE_BUILD_TYPE=Release \
..
#gettextize -f
@@ -97,6 +98,19 @@
%ghost %config(noreplace) %{_var}/log/zypper.log
%changelog
+* Mon Sep 03 2007 - jkupec@suse.cz
+- fix broken compiler flags (schwab)
+- r7099
+- 0.8.19
+* Mon Sep 03 2007 - jkupec@suse.cz
+- authentication prompt implemented (#190609)
+- LOCK documention added to man page (mvidner)
+- r7093
+* Mon Sep 03 2007 - jkupec@suse.cz
+- removing rpm message improved (#307132)
+- r7086
+* Mon Sep 03 2007 - kkaempf@suse.de
+- make (r)etry (c)ancel answer case-insensitive (#307122)
* Fri Aug 31 2007 - jkupec@suse.cz
- fixed error message of zypper ar -r (#306667)
- r7055
++++++ zypper-0.8.18.tar.bz2 -> zypper-0.8.19.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.18/doc/zypper.8 new/zypper-0.8.19/doc/zypper.8
--- old/zypper-0.8.18/doc/zypper.8 2007-08-31 16:08:42.000000000 +0200
+++ new/zypper-0.8.19/doc/zypper.8 2007-09-03 17:34:02.000000000 +0200
@@ -346,11 +346,38 @@
.I \-R, \-\-root <dir>
Operates on a different root directory.
+.SH "LOCKS"
+.LP
+The file
+.B /etc/zypp/locks
+can contain a list of packages to be locked. These will not be updated
+or removed by the solver.
+
+Empty lines and lines beginning with \fB#\fR are ignored. Each line is of the form
+"\fIPATTERN \fR[ \fIOP EDITION \fR]"
+where
+.I PATTERN
+is a name with shell wildcards \fB?\fR and \fB*\fR,
+.I OP
+is one of \fB< <= = >= >\fR, and
+.I EDITION
+is \fI VERSION\fR[\fB-\fIRELEASE\fR].
+
+.TP
+Example:
+# Don't update the old KDE
+.br
+kde* < 3.5
+
+
.SH "FILES"
.TP
.B /etc/zypp/repos.d
Directory containing repository configuration (*.repo) files. You can use the \fBrepo\fR commands to manipulate these files, or you can edit them yourself. In either case, after doing the modifications, executing \fBzypper refresh\fR is strongly recommended.
.TP
+.B /etc/zypp/locks
+File with package lock definitions, see the section LOCKS.
+.TP
.B /var/cache/zypp/raw
Directory for storing raw metadata contained in repositories.
.TP
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.18/package/zypper.changes new/zypper-0.8.19/package/zypper.changes
--- old/zypper-0.8.18/package/zypper.changes 2007-08-31 16:08:43.000000000 +0200
+++ new/zypper-0.8.19/package/zypper.changes 2007-09-03 17:34:02.000000000 +0200
@@ -1,4 +1,29 @@
-------------------------------------------------------------------
+Mon Sep 3 17:32:33 CEST 2007 - jkupec@suse.cz
+
+- fix broken compiler flags (schwab)
+- r7099
+- 0.8.19
+
+-------------------------------------------------------------------
+Mon Sep 3 17:09:00 CEST 2007 - jkupec@suse.cz
+
+- authentication prompt implemented (#190609)
+- LOCK documention added to man page (mvidner)
+- r7093
+
+-------------------------------------------------------------------
+Mon Sep 3 14:15:59 CEST 2007 - jkupec@suse.cz
+
+- removing rpm message improved (#307132)
+- r7086
+
+-------------------------------------------------------------------
+Mon Sep 3 12:34:35 CEST 2007 - kkaempf@suse.de
+
+- make (r)etry (c)ancel answer case-insensitive (#307122)
+
+-------------------------------------------------------------------
Fri Aug 31 14:35:01 CEST 2007 - jkupec@suse.cz
- fixed error message of zypper ar -r (#306667)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.18/src/zypper-media-callbacks.h new/zypper-0.8.19/src/zypper-media-callbacks.h
--- old/zypper-0.8.18/src/zypper-media-callbacks.h 2007-08-31 16:08:42.000000000 +0200
+++ new/zypper-0.8.19/src/zypper-media-callbacks.h 2007-09-03 17:34:02.000000000 +0200
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include "zypper.h"
#include "zypper-callbacks.h"
@@ -106,6 +107,50 @@
}
};
+ struct AuthenticationReportReceiver : public zypp::callback::ReceiveReportzypp::media::AuthenticationReport
+ {
+ virtual bool prompt(const zypp::Url & url,
+ const std::string & description,
+ zypp::media::AuthData & auth_data)
+ {
+ if (gSettings.non_interactive)
+ {
+ MIL << "Non-interactive mode: aborting" << std::endl;
+ cout_vv << description << std::endl;
+ cout_vv << "Non-interactive mode: aborting" << std::endl;
+ return false;
+ }
+
+ cout << description << std::endl;
+
+ // curl authentication
+ zypp::media::CurlAuthData * auth_data_ptr =
+ dynamic_castzypp::media::CurlAuthData* (&auth_data);
+ if (auth_data_ptr)
+ {
+ cout_vv << "available auth types: "
+ << auth_data_ptr->authTypeAsString() << std::endl;
+
+ cout << "User Name: ";
+ string username;
+ std::cin >> username;
+ auth_data_ptr->setUserName(username);
+
+ cout << "Password: ";
+ string password;
+ std::cin >> password;
+ if (password.empty()) return false;
+ auth_data_ptr->setPassword(password);
+
+ auth_data_ptr->setAuthType("basic,digest");
+
+ return true;
+ }
+
+ return false;
+ }
+ };
+
///////////////////////////////////////////////////////////////////
}; // namespace ZmartRecipients
///////////////////////////////////////////////////////////////////
@@ -115,18 +160,21 @@
private:
ZmartRecipients::MediaChangeReportReceiver _mediaChangeReport;
ZmartRecipients::DownloadProgressReportReceiver _mediaDownloadReport;
+ ZmartRecipients::AuthenticationReportReceiver _mediaAuthenticationReport;
public:
MediaCallbacks()
{
MIL << "Set media callbacks.." << endl;
_mediaChangeReport.connect();
_mediaDownloadReport.connect();
+ _mediaAuthenticationReport.connect();
}
~MediaCallbacks()
{
_mediaChangeReport.disconnect();
_mediaDownloadReport.disconnect();
+ _mediaAuthenticationReport.disconnect();
}
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.18/src/zypper-media-callbacks.h.rej new/zypper-0.8.19/src/zypper-media-callbacks.h.rej
--- old/zypper-0.8.18/src/zypper-media-callbacks.h.rej 2007-08-31 16:08:43.000000000 +0200
+++ new/zypper-0.8.19/src/zypper-media-callbacks.h.rej 2007-09-03 17:34:02.000000000 +0200
@@ -1,68 +1,40 @@
***************
-*** 20,25 ****
- #include
- #include
- #include
-
- #include "AliveCursor.h"
-
---- 20,26 ----
- #include
- #include
- #include
-+ #include
+*** 115,131 ****
+ private:
+ ZmartRecipients::MediaChangeReportReceiver _mediaChangeReport;
+ ZmartRecipients::DownloadProgressReportReceiver _mediaDownloadReport;
+ public:
+ MediaCallbacks()
+ {
+ _mediaChangeReport.connect();
+ _mediaDownloadReport.connect();
+ }
- #include "AliveCursor.h"
+ ~MediaCallbacks()
+ {
+ _mediaChangeReport.disconnect();
+ _mediaDownloadReport.disconnect();
+ }
+ };
-***************
-*** 71,77 ****
- display_error (error, konreason);
+--- 152,171 ----
+ private:
+ ZmartRecipients::MediaChangeReportReceiver _mediaChangeReport;
+ ZmartRecipients::DownloadProgressReportReceiver _mediaDownloadReport;
++ ZmartRecipients::AuthenticationReportReceiver _mediaAuthenticationReport;
+ public:
+ MediaCallbacks()
+ {
+ _mediaChangeReport.connect();
+ _mediaDownloadReport.connect();
++ _mediaAuthenticationReport.connect();
}
- };
-
- ///////////////////////////////////////////////////////////////////
- }; // namespace ZmartRecipients
- ///////////////////////////////////////////////////////////////////
---- 72,113 ----
- display_error (error, konreason);
+
+ ~MediaCallbacks()
+ {
+ _mediaChangeReport.disconnect();
+ _mediaDownloadReport.disconnect();
++ _mediaAuthenticationReport.disconnect();
}
- };
-+
-+ struct AuthenticationReportReceiver : public zypp::callback::ReceiveReportzypp::media::AuthenticationReport
-+ {
-+ virtual bool prompt(const zypp::Url & url,
-+ const std::string & description,
-+ zypp::media::AuthData & auth_data)
-+ {
-+ std::cout << description << std::endl;
-+
-+ // curl authentication
-+ zypp::media::CurlAuthData * auth_data_ptr =
-+ dynamic_castzypp::media::CurlAuthData* (&auth_data);
-+ if (auth_data_ptr)
-+ {
-+ std::cout << "available auth types: "
-+ << auth_data_ptr->authTypeAsString() << std::endl;
-
-+ std::cout << "User Name: ";
-+ string username;
-+ std::cin >> username;
-+ auth_data_ptr->setUserName(username);
-+
-+ std::cout << "Password: ";
-+ string password;
-+ std::cin >> password;
-+ if (password.empty()) return false;
-+ auth_data_ptr->setPassword(password);
-+
-+ auth_data_ptr->setAuthType("basic,digest");
-+
-+ return true;
-+ }
-+
-+ return false;
-+ }
-+ };
- ///////////////////////////////////////////////////////////////////
- }; // namespace ZmartRecipients
- ///////////////////////////////////////////////////////////////////
+ };
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.18/src/zypper-misc.cc new/zypper-0.8.19/src/zypper-misc.cc
--- old/zypper-0.8.18/src/zypper-misc.cc 2007-08-31 16:08:42.000000000 +0200
+++ new/zypper-0.8.19/src/zypper-misc.cc 2007-09-03 17:34:02.000000000 +0200
@@ -1,5 +1,6 @@
#include <fstream>
#include <sstream>
+#include
#include
#include
@@ -453,6 +454,9 @@
cerr_v << "cin: " << cin.rdstate() << endl;
return false;
}
+ if (isupper( reply_s[0] ))
+ reply_s[0] = tolower( reply_s[0] );
+
// translators: corresponds to (r)etry
if (reply_s == _("r"))
return true;
@@ -742,8 +746,11 @@
cout << endl;
- cout_n << format(_("Overall download size: %s.")) % download_size;
- cout_n << " ";
+ if (download_size > 0)
+ {
+ cout_n << format(_("Overall download size: %s.")) % download_size;
+ cout_n << " ";
+ }
if (new_installed_size > 0)
// TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
cout_n << format(_("After the operation, additional %s will be used."))
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.18/src/zypper-rpm-callbacks.h new/zypper-0.8.19/src/zypper-rpm-callbacks.h
--- old/zypper-0.8.18/src/zypper-rpm-callbacks.h 2007-08-31 16:08:43.000000000 +0200
+++ new/zypper-0.8.19/src/zypper-rpm-callbacks.h 2007-09-03 17:34:02.000000000 +0200
@@ -137,13 +137,16 @@
{
virtual void start( zypp::Resolvable::constPtr resolvable )
{
- display_progress ( "remove-resolvable", cout, _("Removing ") + to_string (resolvable), 0);
+ //! \todo (10.3+) use format
+ display_progress ( "remove-resolvable", cout,
+ _("Removing ") + resolvable->name() + string("-") + resolvable->edition().asString(), 0);
}
virtual bool progress(int value, zypp::Resolvable::constPtr resolvable)
{
// TranslatorExplanation This text is a progress display label e.g. "Removing [42%]"
- display_progress ( "remove-resolvable", cout, _("Removing ") + to_string (resolvable), value);
+ display_progress ( "remove-resolvable", cout,
+ _("Removing ") + resolvable->name() + string("-") + resolvable->edition().asString(), value);
return true;
}
@@ -177,7 +180,7 @@
void display_step( zypp::Resolvable::constPtr resolvable, int value )
{
- // TranslatorExplanation This text is a progress display label e.g. "Installing [42%]"
+ // TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
string s = boost::str(boost::format(_("Installing: %s-%s"))
% resolvable->name() % resolvable->edition());
display_progress ( "install-resolvable", cout, s, value);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.18/VERSION.cmake new/zypper-0.8.19/VERSION.cmake
--- old/zypper-0.8.18/VERSION.cmake 2007-08-31 16:08:43.000000000 +0200
+++ new/zypper-0.8.19/VERSION.cmake 2007-09-03 17:34:02.000000000 +0200
@@ -20,4 +20,4 @@
SET(VERSION_MAJOR "0")
SET(VERSION_MINOR "8")
-SET(VERSION_PATCH "18")
+SET(VERSION_PATCH "19")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.8.18/zypper.spec.cmake new/zypper-0.8.19/zypper.spec.cmake
--- old/zypper-0.8.18/zypper.spec.cmake 2007-08-31 16:08:43.000000000 +0200
+++ new/zypper-0.8.19/zypper.spec.cmake 2007-09-03 17:34:02.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package @PACKAGE@ (Version @VERSION@)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -14,7 +14,7 @@
BuildRequires: libzypp-devel > 3.20.1 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1
BuildRequires: gcc-c++ >= 4.2 cmake >= 2.4.6 pkg-config >= 0.20
Requires: procps
-License: GPL
+License: GPL v2 or later
Group: System/Packages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Autoreqprov: on
@@ -24,7 +24,7 @@
Release: 0
Source: @PACKAGE@-@VERSION@.tar.bz2
Prefix: /usr
-Url: http://en.opensuse.org/Zypper
+URL: http://en.opensuse.org/Zypper
Provides: y2pmsh
Obsoletes: y2pmsh
@@ -46,8 +46,9 @@
cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \
-DSYSCONFDIR=%{_sysconfdir} \
-DMANDIR=%{_mandir} \
- -DCMAKE_C_FLAGS="%{optflags}" \
- -DCMAKE_CXX_FLAGS="%{optflags}" \
+ -DCMAKE_VERBOSE_MAKEFILE=TRUE \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \
-DCMAKE_BUILD_TYPE=Release \
..
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org