Hello community,
here is the log from the commit of package zypper
checked in at Mon Mar 10 03:01:43 CET 2008.
--------
--- zypper/zypper.changes 2008-02-29 17:46:25.000000000 +0100
+++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2008-03-09 21:43:55.000000000 +0100
@@ -1,0 +2,43 @@
+Fri Mar 7 16:49:46 CET 2008 - jkupec@suse.cz
+
+- fixed crashing when searching with no search terms (bnc #366487)
+- r9055
+- 0.10.3
+
+-------------------------------------------------------------------
+Fri Mar 7 14:57:37 CET 2008 - jreidinger@suse.cz
+
+- addrepo now allows to use a .repo file URI as an argument
+ (bnc #240018)
+- r9047
+
+-------------------------------------------------------------------
+Fri Mar 7 12:56:21 CET 2008 - jreidinger@suse.cz
+
+- allow write repo as number or URL -repo and for repo-manipulating
+ commands (bnc #298312)
+- allow multiple repos in removerepo command (bnc #244440)
+- r9044
+
+-------------------------------------------------------------------
+Thu Mar 6 18:35:09 CET 2008 - jkupec@suse.cz
+
+- bash completion script added (thanx to Marek Stopka)
+- r9035
+
+-------------------------------------------------------------------
+Thu Mar 6 11:21:34 CET 2008 - jkupec@suse.cz
+
+- don't show download progress of the media file if not vebose
+ (bnc #330614)
+- r9026
+
+-------------------------------------------------------------------
+Tue Mar 4 16:09:05 CET 2008 - jkupec@suse.cz
+
+- appropriate error message for problems with rpm database during
+ reading installed packages or after installation (bnc #364370)
+- say 'no space will be freed/used' instead of '0 will be freed'
+ (bnc #309112)
+
+-------------------------------------------------------------------
Old:
----
zypper-0.10.2.tar.bz2
New:
----
zypper-0.10.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zypper.spec ++++++
--- /var/tmp/diff_new_pack.xo9849/_old 2008-03-10 03:01:27.000000000 +0100
+++ /var/tmp/diff_new_pack.xo9849/_new 2008-03-10 03:01:27.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package zypper (Version 0.10.2)
+# spec file for package zypper (Version 0.10.3)
#
# Copyright (c) 2008 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.10.2
+Version: 0.10.3
Release: 1
-Source: zypper-0.10.2.tar.bz2
+Source: zypper-0.10.3.tar.bz2
Prefix: /usr
Url: http://en.opensuse.org/Zypper
Provides: y2pmsh
@@ -83,6 +83,7 @@
%files -f zypper.lang
%defattr(-,root,root)
%{_sysconfdir}/logrotate.d/zypper.lr
+%{_sysconfdir}/bash_completion.d/zypper.sh
%{_bindir}/zypper
%{_bindir}/installation_sources
%{_sbindir}/zypp-checkpatches
@@ -102,6 +103,31 @@
# it from being erased by rpm -e
%ghost %config(noreplace) %{_var}/log/zypper.log
%changelog
+* Fri Mar 07 2008 jkupec@suse.cz
+- fixed crashing when searching with no search terms (bnc #366487)
+- r9055
+- 0.10.3
+* Fri Mar 07 2008 jreidinger@suse.cz
+- addrepo now allows to use a .repo file URI as an argument
+ (bnc #240018)
+- r9047
+* Fri Mar 07 2008 jreidinger@suse.cz
+- allow write repo as number or URL -repo and for repo-manipulating
+ commands (bnc #298312)
+- allow multiple repos in removerepo command (bnc #244440)
+- r9044
+* Thu Mar 06 2008 jkupec@suse.cz
+- bash completion script added (thanx to Marek Stopka)
+- r9035
+* Thu Mar 06 2008 jkupec@suse.cz
+- don't show download progress of the media file if not vebose
+ (bnc #330614)
+- r9026
+* Tue Mar 04 2008 jkupec@suse.cz
+- appropriate error message for problems with rpm database during
+ reading installed packages or after installation (bnc #364370)
+- say 'no space will be freed/used' instead of '0 will be freed'
+ (bnc #309112)
* Fri Feb 29 2008 jkupec@suse.cz
- --xmlout for repos, install, update, dist-upgrade, remove,
list-updates, refresh, and *repo command complete (fate #302595)
++++++ zypper-0.10.2.tar.bz2 -> zypper-0.10.3.tar.bz2 ++++++
++++ 3168 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.10.2/doc/zypper.8 new/zypper-0.10.3/doc/zypper.8
--- old/zypper-0.10.2/doc/zypper.8 2008-02-29 17:46:24.000000000 +0100
+++ new/zypper-0.10.3/doc/zypper.8 2008-03-09 21:43:54.000000000 +0100
@@ -46,8 +46,8 @@
Displays full info for the specified packages or other resolvables.
.TP
-.I \-r, \-\-repo <alias>
-Work only with the repository specified by the alias.
+.I \-r, \-\-repo
+Work only with the repository specified by the alias, number or URL.
.TP
.I \-t, \-\-type <type>
Type of resolvable (default: package). Currently supported resolvable types for
@@ -85,8 +85,8 @@
respective resolvables for installation.
.TP
-\fI\-r, \-\-repo\fR <alias>
-Install resolvables only from the repository specified by the alias.
+\fI\-r, \-\-repo\fR
+Install resolvables only from the repository specified by the alias, number or URL.
.TP
\fI\-t, \-\-type\fR
Type of resolvable (default: package)
@@ -137,8 +137,8 @@
\fI\-t, --type\fR
Type of resolvable (default: patch)
.TP
-\fI\-r, \-\-repo\fR <alias>
-List only updates from the repository specified by the alias.
+\fI\-r, \-\-repo\fR
+List only updates from the repository specified by the alias, number or URL.
See also the NOTE at
.BR update .
@@ -153,8 +153,8 @@
For details see the install command
.TP
-\fI\-r, \-\-repo\fR <alias>
-Operate only with resolvables from repository specified by alias.
+\fI\-r, \-\-repo\fR
+Operate only with resolvables from repository specified by alias, number or URL.
.TP
\fI\-t, -\-type\fR
Type of resolvable (default: package)
@@ -186,8 +186,8 @@
\fI\-t, -\-type\fR
Type of resolvable (default: patch)
.TP
-\fI\-r, \-\-repo\fR <alias>
-Limit updates to repository specified by alias.
+\fI\-r, \-\-repo\fR
+Limit updates to repository specified by alias, number or URL.
.TP
.I \-\-skip\-interactive
This will skip interactive patches, that is, those that need reboot,
@@ -221,8 +221,8 @@
and product updates, etc.
.TP
-\fI\-r, \-\-repo\fR <alias>
-Limit updates to repository specified by alias.
+\fI\-r, \-\-repo\fR
+Limit updates to repository specified by alias, number or URL.
.TP
.I \-l, \-\-auto\-agree\-with\-licenses
Automatically say 'yes' to third party license confirmation prompt. By using this option, you choose to agree with licenses of all third-party software this command will install. This option is particularly useful for administators installing the same set of packages on multiple machines (by an automated process) and have the licenses confirmed before.
@@ -276,8 +276,8 @@
Search only for resolvables of specified type. See the beginning of the subsection for the list of available resolvable types.
Multiple \-t option are allowed.
.TP
-.I \-r, \-\-repo <alias>
-Search only in the repository specified by the alias.
+.I \-r, \-\-repo
+Search only in the repository specified by the alias, number or URL.
Multiple \-r options are allowed.
.TP
\fI \-\-sort\-by\-name\fR
@@ -296,16 +296,16 @@
See also the EXIT CODES section for details on exit status of 0, 100, and 101
returned by this command.
.TP
-.I \-r, \-\-repo <alias>
-Check for patches only in the repository specified by the alias.
+.I \-r, \-\-repo
+Check for patches only in the repository specified by the alias, number or URL.
.TP
.B patches (pch)
List patches. Lists all patches that are available, including
installed and not applicable ones.
.TP
-.I \-r, \-\-repo <alias>
-Check for patches only in the repository specified by the alias.
+.I \-r, \-\-repo
+Check for patches only in the repository specified by the alias, number or URL.
.SS Repository Management
@@ -315,8 +315,8 @@
Management servers, as well as local files.
.TP
-.B addrepo (ar) [options] <URI> <alias>
-Add a new repository specified by URI and assign specified alias to it.
+.B addrepo (ar) [options] <URI> [<alias>]
+Add a new repository specified by URI and assign specified alias to it or specify URI to repo file.
.TP
\fI\-r, \-\-repo\fR
Read URI and alias from specified .repo file
@@ -337,8 +337,8 @@
NOTE: This command does not automatically refresh the newly added repositories. You have to use the \fBrefresh\fR command after finishing your modifications to repositories with \fB*repo\fR commands.
.TP
-.B removerepo (rr) [options]
-Delete repository specified by alias or URI.
+.B removerepo (rr) [options] ...
+Delete repositories specified by aliases, numbers or URIs.
.TP
\fI --loose-auth\fR
Ignore user authentication data in the URI
@@ -362,12 +362,12 @@
the repositories will be written to the standard output.
.TP
-.B renamerepo (nr) <alias> <new-alias>
-Assign new alias to the repository specified by alias.
+.B renamerepo (nr) <new-alias>
+Assign new alias to the repository specified by alias, number or URL.
.TP
-.B modifyrepo (mr) <options> <alias>
-Modify properties of the repository specified by alias.
+.B modifyrepo (mr) <options>
+Modify properties of the repository specified by alias, number or URL.
.TP
\fI\-e, \-\-enable\fR
Enable the repository.
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.10.2/package/zypper.changes new/zypper-0.10.3/package/zypper.changes
--- old/zypper-0.10.2/package/zypper.changes 2008-02-29 17:46:24.000000000 +0100
+++ new/zypper-0.10.3/package/zypper.changes 2008-03-09 21:43:55.000000000 +0100
@@ -1,4 +1,47 @@
-------------------------------------------------------------------
+Fri Mar 7 16:49:46 CET 2008 - jkupec@suse.cz
+
+- fixed crashing when searching with no search terms (bnc #366487)
+- r9055
+- 0.10.3
+
+-------------------------------------------------------------------
+Fri Mar 7 14:57:37 CET 2008 - jreidinger@suse.cz
+
+- addrepo now allows to use a .repo file URI as an argument
+ (bnc #240018)
+- r9047
+
+-------------------------------------------------------------------
+Fri Mar 7 12:56:21 CET 2008 - jreidinger@suse.cz
+
+- allow write repo as number or URL -repo and for repo-manipulating
+ commands (bnc #298312)
+- allow multiple repos in removerepo command (bnc #244440)
+- r9044
+
+-------------------------------------------------------------------
+Thu Mar 6 18:35:09 CET 2008 - jkupec@suse.cz
+
+- bash completion script added (thanx to Marek Stopka)
+- r9035
+
+-------------------------------------------------------------------
+Thu Mar 6 11:21:34 CET 2008 - jkupec@suse.cz
+
+- don't show download progress of the media file if not vebose
+ (bnc #330614)
+- r9026
+
+-------------------------------------------------------------------
+Tue Mar 4 16:09:05 CET 2008 - jkupec@suse.cz
+
+- appropriate error message for problems with rpm database during
+ reading installed packages or after installation (bnc #364370)
+- say 'no space will be freed/used' instead of '0 will be freed'
+ (bnc #309112)
+
+-------------------------------------------------------------------
Fri Feb 29 17:15:38 CET 2008 - jkupec@suse.cz
- --xmlout for repos, install, update, dist-upgrade, remove,
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.10.2/po/POTFILES.in new/zypper-0.10.3/po/POTFILES.in
--- old/zypper-0.10.2/po/POTFILES.in 2008-02-29 17:46:24.000000000 +0100
+++ new/zypper-0.10.3/po/POTFILES.in 2008-03-09 21:43:54.000000000 +0100
@@ -31,4 +31,5 @@
../src/zypper-getopt.h
../src/zypper-search.h
../src/checkpatches-keyring-callbacks.h
+../src/output/OutNormal.cc
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.10.2/src/bash-completion.sh new/zypper-0.10.3/src/bash-completion.sh
--- old/zypper-0.10.2/src/bash-completion.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/zypper-0.10.3/src/bash-completion.sh 2008-03-09 21:43:55.000000000 +0100
@@ -0,0 +1,114 @@
+# zypper completion v 0.2 aplha 1 :-) (This is not feature complete version!)
+# A hackweek gift from Marek Stopka
+#
+# some TODOs:
+# - complete package names for install/remove/update
+# - make sure the default file completion always works for:
+# * install (to install plain rpms)
+# * addrepo --repo (to specify .repo file)
+# * maybe other cases
+
+_zypper() {
+ ZYPPER="/usr/bin/zypper -q"
+ local magic_string="Command options:"
+ local opts cur prev prevprev
+ if test ${#MODLIST[*]} = 0; then
+ for foo in $(LC_ALL=C $ZYPPER -h | sed -e "1,/Commands:/d" | awk -F ' ' '{print $1}' | sed 's/,//'); do
+ MODLIST="$MODLIST $foo"
+ done
+ fi
+
+ cur=${COMP_WORDS[COMP_CWORD]}
+ prev=${COMP_WORDS[COMP_CWORD-1]}
+ if [[ ${#COMP_WORDS[@]} -ge 3 ]]; then
+ prevprev=${COMP_WORDS[COMP_CWORD-2]}
+ fi
+
+ case "$prev" in
+ zypper)
+ opts=$MODLIST
+ COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ ;;
+ help)
+ opts=$MODLIST
+ COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ ;;
+ shell)
+ return 0
+ ;;
+ install)
+ opts=$(LC_ALL=C $ZYPPER help $prev 2>&1 | sed -e "1,/$magic_string/d" -e 's/.*--/--/' -e 's/ .*//')
+ COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ ;;
+ remove)
+ opts=$(LC_ALL=C $ZYPPER help $prev 2>&1 | sed -e "1,/$magic_string/d" -e 's/.*--/--/' -e 's/ .*//')
+ COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ ;;
+ search)
+ opts=$(LC_ALL=C $ZYPPER help $prev 2>&1 | sed -e "1,/$magic_string/d" -e 's/.*--/--/' -e 's/ .*//' | grep -v '*')
+ COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ ;;
+ repos)
+ opts=$(LC_ALL=C $ZYPPER help $prev 2>&1 | sed -e "1,/$magic_string/d" -e 's/.*--/--/' -e 's/ .*//')
+ COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ ;;
+ addrepo)
+ opts=$(LC_ALL=C $ZYPPER help $prev 2>&1 | sed -e "1,/$magic_string/d" -e 's/.*--/--/' -e 's/ .*//')
+ COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ ;;
+ removerepo)
+ opts=$(LC_ALL=C $ZYPPER help $prev 2>&1 | sed -e "1,/$magic_string/d" -e 's/.*--/--/' -e 's/ .*//')
+ COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ ;;
+ renamerepo)
+ return 0
+ ;;
+ modifyrepo)
+ opts=$(LC_ALL=C $ZYPPER help $prev 2>&1 | sed -e "1,/$magic_string/d" -e 's/.*--/--/' -e 's/ .*//')
+ COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ ;;
+ refresh)
+ opts=$(LC_ALL=C $ZYPPER help $prev 2>&1 | sed -e "1,/$magic_string/d" -e 's/.*--/--/' -e 's/ .*//')
+ COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ ;;
+ patch_check)
+ opts=$(LC_ALL=C $ZYPPER help $prev 2>&1 | sed -e "1,/$magic_string/d" -e 's/.*--/--/' -e 's/ .*//')
+ COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ ;;
+ patches)
+ opts=$(LC_ALL=C $ZYPPER help $prev 2>&1 | sed -e "1,/$magic_string/d" -e 's/.*--/--/' -e 's/ .*//')
+ COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ ;;
+ list-updates)
+ opts=$(LC_ALL=C $ZYPPER help $prev 2>&1 | sed -e "1,/$magic_string/d" -e 's/.*--/--/' -e 's/ .*//')
+ COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ ;;
+ xml-updates)
+ opts=$(LC_ALL=C $ZYPPER help $prev 2>&1 | sed -e "1,/$magic_string/d" -e 's/.*--/--/' -e 's/ .*//')
+ COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ ;;
+ update)
+ opts=$(LC_ALL=C $ZYPPER help $prev 2>&1 | sed -e "1,/$magic_string/d" -e 's/.*--/--/' -e 's/ .*//')
+ COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ ;;
+ info)
+ opts=$(LC_ALL=C $ZYPPER help $prev 2>&1 | sed -e "1,/$magic_string/d" -e 's/.*--/--/' -e 's/ .*//')
+ COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ ;;
+ patch-info)
+ return 0
+ ;;
+ source-install)
+ return 0
+ ;;
+ "--type")
+ opts="package patch pattern product"
+ COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ ;;
+ dist-upgrade)
+ opts=$(LC_ALL=C $ZYPPER help $prev 2>&1 | sed -e "1,/$magic_string/d" -e 's/.*--/--/' -e 's/ .*//')
+ COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ esac
+}
+
+complete -F _zypper zypper
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.10.2/src/CMakeLists.txt new/zypper-0.10.3/src/CMakeLists.txt
--- old/zypper-0.10.2/src/CMakeLists.txt 2008-02-29 17:46:24.000000000 +0100
+++ new/zypper-0.10.3/src/CMakeLists.txt 2008-03-09 21:43:55.000000000 +0100
@@ -80,6 +80,12 @@
RUNTIME DESTINATION ${INSTALL_PREFIX}/sbin
)
+INSTALL(
+ FILES bash-completion.sh
+ DESTINATION ${SYSCONFDIR}/bash_completion.d
+ RENAME zypper.sh
+)
+
ADD_EXECUTABLE( zypp-checkpatches-wrapper zypp-checkpatches-wrapper.c )
TARGET_LINK_LIBRARIES( zypp-checkpatches-wrapper ${ZYPP_LIBRARY} )
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.10.2/src/output/Out.h new/zypper-0.10.3/src/output/Out.h
--- old/zypper-0.10.2/src/output/Out.h 2008-02-29 17:46:24.000000000 +0100
+++ new/zypper-0.10.3/src/output/Out.h 2008-03-09 21:43:55.000000000 +0100
@@ -10,10 +10,42 @@
#include "prompt.h"
/**
+ * Base class for producing common (for now) zypper output.
*
- * - Logger (DBG, MIL, ...) must be in place
- * - out.XX wherever output is needed
+ * This is an abstract class providing interface for writing output like
+ * info messages, warnings, error messages, user prompts, progress reports,
+ * and download progress reports. See descriptions of the methods for more
+ * details.
*
+ * The output is produced using Out derived class instances.
+ *
+ * <code>
+ *
+ * // create output object
+ * SomePointerType<Out> out;
+ * if (options.count("xmlout"))
+ * out = new OutXML();
+ * else
+ * out = new OutNormal();
+ *
+ * out->info("output instance ready to use", Out::HIGH);
+ * out->info("Doing foo");
+ * try
+ * {
+ * foo();
+ * out->prompt(PROMPT_FOO, "Need your action?", "y/n"); // see output/prompt.h
+ * if (action())
+ * out->info("result", Out::QUIET); // always show the result
+ * else
+ * cout << "special result" << endl; // special output must be done
+ * // the usual way for now
+ * }
+ * catch(const zypp::Exception & e)
+ * {
+ * out->error(e, "Problem doing foo", "Do 'bar' to deal with this");
+ * }
+ *
+ * </code>
*/
class Out : private zypp::base::NonCopyable
{
@@ -23,13 +55,16 @@
{
/** Only important messages (no progress or status, only the result). */
QUIET = 0,
- /** */
+ /** Default output verbosity level. Progress for important tasks, moderate
+ * amount of status messages, operation information, result. */
NORMAL = 1,
/** More detailed description of the operations. */
HIGH = 2,
+ /** \todo drop this level in favor of zypper.log? */
DEBUG = 3
} Verbosity;
+ /** Known output types implemented by derived classes. */
typedef enum
{
TYPE_NORMAL = 1,
@@ -83,7 +118,7 @@
* \param hint Hint for the user (what to do, or explanation)
*/
virtual void error(const std::string & problem_desc, const std::string & hint = "") = 0;
-
+
/**
* Prints the problem description caused by an exception, its cause and,
* optionaly, a hint for the user.
@@ -96,17 +131,46 @@
const std::string & problem_desc,
const std::string & hint = "") = 0;
- // virtual void table()
- // virtual void text()
+ //! \todo provide an error() method with a/r/i prompt, more read_action_ari here
- /** \name Progress */
+ /** \name Progress of an operation. */
//@{
+ /**
+ * Start of an operation with reported progress.
+ *
+ * \param id Identifier. Any string used to match multiple overlapping
+ * progress reports (doesn't happen now,
+ * but probably will in the future).
+ * \param label Progress description.
+ * \param is_tick <tt>false</tt> for known progress percentage, <tt>true</tt>
+ * for 'still alive' notifications
+ */
virtual void progressStart(const std::string & id,
const std::string & label,
bool is_tick = false) = 0;
+
+ /**
+ * Progress report for an on-going operation.
+ *
+ * \param id Identifier. Any string used to match multiple overlapping
+ * progress reports.
+ * \param label Progress description.
+ * \param value Percentage value or <tt>-1</tt> if unknown ('still alive'
+ * notification)
+ */
virtual void progress(const std::string & id,
const std::string & label,
int value = -1) = 0;
+
+ /**
+ * End of an operation with reported progress.
+ *
+ * \param id Identifier. Any string used to match multiple overlapping
+ * progress reports.
+ * \param label Progress description.
+ * \param error <tt>false</tt> if the operation finished with success,
+ * <tt>true</tt> otherwise.
+ */
virtual void progressEnd(const std::string & id,
const std::string & label,
bool error = false) = 0; // might be a string with error message instead
@@ -115,11 +179,15 @@
/** \name Download progress with download rate */
//@{
/**
+ * Reoprt start of a download.
+ *
* \param uri Uri of the file to download.
*/
virtual void dwnldProgressStart(const zypp::Url & uri) = 0;
/**
+ * Reports download progress.
+ *
* \param uri Uri of the file being downloaded.
* \param value Value of the progress in percents. -1 if unknown.
* \param rate Download rate. -1 if unknown.
@@ -128,6 +196,8 @@
int value = -1,
int rate = -1) = 0;
/**
+ * Reports end of a download.
+ *
* \param uri Uri of the file to download.
* \param rate Final download rate. -1 if unknown.
* \param error Error flag - did the download finish with error?
@@ -137,6 +207,15 @@
bool error = false) = 0;
//@}
+ /**
+ * Prompt the user for a decision.
+ *
+ * \param id Unique prompt identifier for use by machines.
+ * \param prompt Prompt text.
+ * \param answer_hint list of answers separated by '/'. \todo improve this
+ *
+ * \see prompt.h
+ */
virtual void prompt(PromptId id,
const std::string & prompt,
const std::string & answer_hint) = 0;
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.10.2/src/zypper.cc new/zypper-0.10.3/src/zypper.cc
--- old/zypper-0.10.2/src/zypper.cc 2008-02-29 17:46:24.000000000 +0100
+++ new/zypper-0.10.3/src/zypper.cc 2008-03-09 21:43:55.000000000 +0100
@@ -663,10 +663,10 @@
{
ZYPP_CAUGHT(ex);
- ostringstream s;
- s << _("Unexpected exception.") << endl;
- s << ex.asUserString();
- out().error(s.str());
+ Out::Verbosity tmp = out().verbosity();
+ out().setVerbosity(Out::DEBUG);
+ out().error(ex, _("Unexpected exception."));
+ out().setVerbosity(tmp);
report_a_bug(out());
}
@@ -854,9 +854,9 @@
specific_options = service_add_options;
_command_help = boost::str(format(_(
// TranslatorExplanation the %s = "yast2, rpm-md, plaindir"
- "addrepo (ar) [options] <URI> <alias>\n"
+ "addrepo (ar) [options] <URI> [<alias>]\n"
"\n"
- "Add repository specified by URI to the system and assing the specified alias to it.\n"
+ "Add repository specified by URI to the system and assing the specified alias to it or specified by URI to repo file.\n"
"\n"
" Command options:\n"
"-r, --repo Read the URL and alias from a file (even remote)\n"
@@ -896,7 +896,7 @@
};
specific_options = service_delete_options;
_command_help = _(
- "removerepo (rr) [options] \n"
+ "removerepo (rr) [options] \n"
"\n"
"Remove repository specified by alias or URL.\n"
"\n"
@@ -915,9 +915,9 @@
};
specific_options = service_rename_options;
_command_help = _(
- "renamerepo [options] <alias> <new-alias>\n"
+ "renamerepo [options] <new-alias>\n"
"\n"
- "Assign new alias to the repository specified by alias.\n"
+ "Assign new alias to the repository specified by alias,number or URL.\n"
"\n"
"This command has no additional options.\n"
);
@@ -938,9 +938,9 @@
};
specific_options = service_modify_options;
_command_help = _(
- "modifyrepo (mr) <options> <alias>\n"
+ "modifyrepo (mr) <options> \n"
"\n"
- "Modify properties of the repository specified by alias.\n"
+ "Modify properties of the repository specified by alias, number or URL.\n"
"\n"
" Command options:\n"
"-d, --disable Disable the repository (but don't remove it)\n"
@@ -967,7 +967,7 @@
_command_help = _(
"refresh (ref) [alias|#] ...\n"
"\n"
- "Refresh repositories specified by their alias or number."
+ "Refresh repositories specified by their alias, number or URL."
" If none are specified, all enabled repositories will be refreshed.\n"
"\n"
" Command options:\n"
@@ -1148,7 +1148,7 @@
"-i, --installed-only Show only packages that are already installed.\n"
"-u, --uninstalled-only Show only packages that are not currently installed.\n"
"-t, --type <type> Search only for packages of the specified type.\n"
- "-r, --repo <alias> Search only in the repository specified by the alias.\n"
+ "-r, --repo Search only in the repository specified by the alias.\n"
" --sort-by-name Sort packages by name (default).\n"
" --sort-by-repo Sort packages by repository.\n"
"\n"
@@ -1494,34 +1494,38 @@
string type = copts.count("type") ? copts["type"].front() : "";
// display help message if insufficient info was given
- if (_arguments.size() < 2)
+ switch (_arguments.size())
{
- out().error(
- _("Too few arguments. At least URL and alias are required."));
- ERR << "Too few arguments. At least URL and alias are required." << endl;
+ case 0:
+ out().error(_("Too few arguments."));
+ ERR << "Too few arguments." << endl;
out().info(_command_help);
setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS);
return;
- }
-
- Url url = make_url (_arguments[0]);
- if (!url.isValid())
- {
- setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS);
- return;
- }
+ case 1:
+ add_repo_from_file(*this,_arguments[0], enabled, refresh);
+ break;
+ case 2:
+ Url url = make_url (_arguments[0]);
+ if (!url.isValid())
+ {
+ setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS);
+ return;
+ }
- // by default, enable the repo and set autorefresh to false
- if (indeterminate(enabled)) enabled = true;
- if (indeterminate(refresh)) refresh = false;
+ // by default, enable the repo and set autorefresh to false
+ if (indeterminate(enabled)) enabled = true;
+ if (indeterminate(refresh)) refresh = false;
- warn_if_zmd();
+ warn_if_zmd();
- // load gpg keys
- init_target(*this);
+ // load gpg keys
+ init_target(*this);
- add_repo_by_url(
- *this, url, _arguments[1]/*alias*/, type, enabled, refresh);
+ add_repo_by_url(
+ *this, url, _arguments[1]/*alias*/, type, enabled, refresh);
+ return;
+ }
}
catch (const repo::RepoUnknownTypeException & e)
{
@@ -1562,58 +1566,31 @@
return;
}
- // too many arguments
- //! \todo allow to specify multiple repos to delete
- else if (_arguments.size() > 1)
- {
- report_too_many_arguments(_command_help);
- setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS);
- return;
- }
-
warn_if_zmd ();
- bool found = remove_repo(*this, _arguments[0]);
- if (found)
- return;
-
- MIL << "Repository not found by alias, trying delete by URL" << endl;
- out().info(_("Repository not found by alias, trying delete by URL..."), Out::HIGH);
-
- Url url;
- try { url = Url (_arguments[0]); }
- catch ( const Exception & excpt_r )
- {
- ZYPP_CAUGHT( excpt_r );
- ostringstream s;
- s << _("Given URL is invalid.") << " " << excpt_r.asUserString();
- out().warning(s.str(), Out::HIGH);
- }
-
- if (url.isValid())
- {
- url::ViewOption urlview = url::ViewOption::DEFAULTS + url::ViewOption::WITH_PASSWORD;
-
- if (copts.count("loose-auth"))
+ //must store repository before remove to ensure correct match number
+ list<RepoInfo> repo_to_remove;
+ for (vector<string>::const_iterator it = _arguments.begin();
+ it!= _arguments.end();++it){
+ RepoInfo repo;
+ if (match_repo(*this,*it,&repo))
{
- urlview = urlview
- - url::ViewOptions::WITH_PASSWORD
- - url::ViewOptions::WITH_USERNAME;
+ repo_to_remove.push_back(repo);
+ }
+ else
+ {
+ MIL << "Repository not found by given alias, number or URL." << endl;
+ out().error(boost::str(format(
+ //TranslatorExplanation %s is string which was not found (can be url,
+ //alias or the repo number)
+ _("Repository %s not found by alias, number or URL."))
+ % *it));
}
-
- if (copts.count("loose-query"))
- urlview = urlview - url::ViewOptions::WITH_QUERY_STR;
-
- found = remove_repo(*this, url, urlview);
}
- else
- found = false;
- if (!found)
- {
- MIL << "Repository not found by given alias or URL." << endl;
- out().error(_("Repository not found by given alias or URL."));
- }
+ for (std::list<RepoInfo>::const_iterator it = repo_to_remove.begin();
+ it!=repo_to_remove.end();++it)
+ remove_repo(*this,*it);
return;
}
@@ -1652,8 +1629,17 @@
// init_target(*this);
warn_if_zmd ();
try {
- // also stores it
- rename_repo(*this, _arguments[0], _arguments[1]);
+ RepoInfo repo;
+ if (match_repo(*this,_arguments[0], &repo))
+ {
+ rename_repo(*this, repo.alias(), _arguments[1]);
+ }
+ else
+ {
+ out().error(boost::str(format(
+ _("Repository '%s' not found.")) % _arguments[0]));
+ ERR << "Repo " << _arguments[0] << " not found" << endl;
+ }
}
catch ( const Exception & excpt_r )
{
@@ -1695,8 +1681,18 @@
setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS);
return;
}
-
- modify_repo(*this, _arguments[0]);
+
+ RepoInfo repo;
+ if (match_repo(*this,_arguments[0],&repo))
+ {
+ modify_repo(*this, repo.alias());
+ }
+ else
+ {
+ out().error(
+ boost::str(format(_("Repository %s not found.")) % _arguments[0]));
+ ERR << "Repo " << _arguments[0] << " not found" << endl;
+ }
}
// --------------------------( refresh )------------------------------------
@@ -2021,19 +2017,16 @@
query.addKind( ResTraits<Package>::kind );
}
- if (copts.count("repo") > 0)
- {
- //options.clearRepos();
- std::liststd::string::const_iterator it;
- for (it = copts["repo"].begin(); it != copts["repo"].end(); ++it) {
- query.addRepo( *it );
- }
- }
-
init_repos(*this);
if (exitCode() != ZYPPER_EXIT_OK)
return;
+ //add available repos to query
+ std::listzypp::RepoInfo::const_iterator repo_it;
+ for (repo_it = gData.repos.begin();repo_it != gData.repos.end();++repo_it){
+ query.addRepo( repo_it->alias());
+ }
+
init_target(*this);
// now load resolvables:
@@ -2044,10 +2037,9 @@
try
{
-
FillTable callback( t, query );
- query.execute(_arguments[0], callback );
-
+ query.execute(_arguments.empty()? string() : _arguments[0], callback );
+
if (t.empty())
out().info(_("No resolvables found."), Out::QUIET);
else {
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.10.2/src/zypper-media-callbacks.h new/zypper-0.10.3/src/zypper-media-callbacks.h
--- old/zypper-0.10.2/src/zypper-media-callbacks.h 2008-02-29 17:46:24.000000000 +0100
+++ new/zypper-0.10.3/src/zypper-media-callbacks.h 2008-03-09 21:43:55.000000000 +0100
@@ -71,26 +71,39 @@
// progress for downloading a file
struct DownloadProgressReportReceiver : public zypp::callback::ReceiveReportzypp::media::DownloadProgressReport
{
- DownloadProgressReportReceiver() : _gopts(Zypper::instance()->globalOpts())
+ DownloadProgressReportReceiver()
+ : _gopts(Zypper::instance()->globalOpts()), _be_quiet(false)
{}
virtual void start( const zypp::Url & uri, zypp::Pathname localfile )
{
Out & out = Zypper::instance()->out();
- // don't show download info unless show_media_progress_hack is used
- if (!gData.show_media_progress_hack && out.verbosity() < Out::HIGH)
+
+ if (out.verbosity() < Out::HIGH &&
+ (
+ // don't show download info unless show_media_progress_hack is used
+ !gData.show_media_progress_hack ||
+ // don't report download of the media file (bnc #330614)
+ zypp::Pathname(uri.getPathName()).basename() == "media"
+ )
+ )
+ {
+ _be_quiet = true;
return;
+ }
+ else
+ _be_quiet = false;
+
out.dwnldProgressStart(uri);
}
//! \todo return false on SIGINT
virtual bool progress(int value, const zypp::Url & uri)
{
- Out & out = Zypper::instance()->out();
- // don't show download info unless show_media_progress_hack is used
- if (!gData.show_media_progress_hack && out.verbosity() < Out::HIGH)
+ if (_be_quiet)
return true;
- out.dwnldProgress(uri, value); //! \todo add rate
+
+ Zypper::instance()->out().dwnldProgress(uri, value); //! \todo add transfer rate
return true;
}
@@ -98,10 +111,9 @@
virtual DownloadProgressReport::Action
problem( const zypp::Url & uri, DownloadProgressReport::Error error, const std::string & description )
{
- Out & out = Zypper::instance()->out();
- if (gData.show_media_progress_hack || out.verbosity() >= Out::HIGH)
- out.dwnldProgressEnd(uri, true);
- out.error(zcb_error2str(error, description));
+ if (_be_quiet)
+ Zypper::instance()->out().dwnldProgressEnd(uri, true);
+ Zypper::instance()->out().error(zcb_error2str(error, description));
return (Action) read_action_ari(PROMPT_ARI_MEDIA_PROBLEM, DownloadProgressReport::ABORT);
}
@@ -109,15 +121,15 @@
// used only to finish, errors will be reported in media change callback (libzypp 3.20.0)
virtual void finish( const zypp::Url & uri, Error error, const std::string & konreason )
{
- Out & out = Zypper::instance()->out();
- // don't show download info unless show_media_progress_hack is used
- if (!gData.show_media_progress_hack && out.verbosity() < Out::HIGH)
+ if (_be_quiet)
return;
- out.dwnldProgressEnd(uri);
+
+ Zypper::instance()->out().dwnldProgressEnd(uri);
}
-
+
private:
const GlobalOptions & _gopts;
+ bool _be_quiet;
};
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.10.2/src/zypper-misc.cc new/zypper-0.10.3/src/zypper-misc.cc
--- old/zypper-0.10.2/src/zypper-misc.cc 2008-02-29 17:46:24.000000000 +0100
+++ new/zypper-0.10.3/src/zypper-misc.cc 2008-03-09 21:43:55.000000000 +0100
@@ -542,7 +542,8 @@
// display the number of problems
if (rproblems.size() > 1)
- zypper.out().info(boost::str(format(_("%s Problems:")) % rproblems.size()));
+ zypper.out().info(boost::str(format(
+ _PL("%d Problem:", "%d Problems:", rproblems.size())) % rproblems.size()));
else if (rproblems.empty())
{
// should not happen! If solve() failed at least one problem must be set!
@@ -901,10 +902,8 @@
// TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
s << format(_("After the operation, additional %s will be used."))
% new_installed_size.asString(0,1,1);
- //! \todo uncomment the following for bug #309112
- /*
else if (new_installed_size == 0)
- s << _("No additional space will be used or freed after the operation.");*/
+ s << _("No additional space will be used or freed after the operation.");
else
{
// get the absolute size
@@ -1721,9 +1720,12 @@
zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP);
return;
}
- catch ( const Exception & excpt_r ) {
- ZYPP_CAUGHT( excpt_r );
- ZYPP_RETHROW( excpt_r );
+ catch ( const Exception & e ) {
+ ZYPP_CAUGHT(e);
+ zypper.out().error(e,
+ _("Problem occured during or after installation or removal of packages:"),
+ _("Please see the above error message for a hint."));
+ zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP);
}
}
}
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.10.2/src/zypper-repos.cc new/zypper-0.10.3/src/zypper-repos.cc
--- old/zypper-0.10.2/src/zypper-repos.cc 2008-02-29 17:46:24.000000000 +0100
+++ new/zypper-0.10.3/src/zypper-repos.cc 2008-03-09 21:43:55.000000000 +0100
@@ -216,6 +216,38 @@
return false; // no error
}
+bool match_repo(Zypper & zypper, string str, RepoInfo *repo)
+{
+ RepoManager manager(zypper.globalOpts().rm_options);
+ list<RepoInfo> known = manager.knownRepositories();
+ bool founded = false;
+
+ unsigned int number = 1; // repo number
+ for (list<RepoInfo>::const_iterator known_it = known.begin();
+ known_it != known.end(); ++known_it, number++)
+ {
+ unsigned int tmp = 0;
+ safe_lexical_cast (str, tmp); // try to make an int out of the string
+
+ try
+ {
+ if (known_it->alias() == str ||
+ tmp == number ||
+ find(known_it->baseUrlsBegin(),known_it->baseUrlsEnd(),Url(str))
+ != known_it->baseUrlsEnd())
+ {
+ *repo = *known_it;
+ founded = true;
+ break;
+ }
+ }
+ catch(const url::UrlException &){}
+
+ } // END for all known repos
+
+ return founded;
+}
+
// ---------------------------------------------------------------------------
/**
@@ -229,37 +261,12 @@
const T & begin, const T & end,
list<RepoInfo> & repos, list<string> & not_found)
{
- RepoManager manager(zypper.globalOpts().rm_options);
- list<RepoInfo> known = manager.knownRepositories();
for (T it = begin; it != end; ++it)
{
RepoInfo repo;
- // can i find it by alias, #, or the url, in that order?
- unsigned int number = 1; // repo number
- for (list<RepoInfo>::const_iterator known_it = known.begin();
- known_it != known.end(); ++known_it, number++)
- {
- unsigned int tmp = 0;
- safe_lexical_cast (*it, tmp); // try to make an int out of the string
-
- try
- {
- if (known_it->alias() == *it ||
- tmp == number ||
- find(known_it->baseUrlsBegin(),known_it->baseUrlsEnd(),Url(*it))
- != known_it->baseUrlsEnd())
- {
- repo = *known_it;
- break;
- }
- }
- catch(const url::UrlException &){}
- } // END for all known repos
-
- // no match found
- if (repo.alias().empty())
+ if (!match_repo(zypper,*it,&repo))
{
not_found.push_back(*it);
continue;
@@ -276,9 +283,10 @@
// alias
if (repo_it->alias() != repo.alias())
+ {
equals = false;
-
- if (equals)
+ }
+ else
{
// URIs (all of them)
for (RepoInfo::urls_const_iterator urlit = repo_it->baseUrlsBegin();
@@ -292,7 +300,10 @@
}
if (equals)
+ {
duplicate = true;
+ break;
+ }
} // END for all found so far
if (!duplicate)
@@ -1259,59 +1270,18 @@
// ----------------------------------------------------------------------------
-bool remove_repo(Zypper & zypper, const RepoInfo & repoinfo)
+void remove_repo(Zypper & zypper, const RepoInfo & repoinfo)
{
RepoManager manager(zypper.globalOpts().rm_options);
- bool found = true;
- try
- {
- manager.removeRepository(repoinfo);
- zypper.out().info(boost::str(
- format(_("Repository '%s' has been removed.")) % repoinfo.name()));
- MIL << format("Repository '%s' has been removed.") % repoinfo.name() << endl;
- }
- catch (const repo::RepoNotFoundException & ex)
- {
- found = false;
- }
-
- return found;
+ manager.removeRepository(repoinfo);
+ zypper.out().info(boost::str(
+ format(_("Repository '%s' has been removed.")) % repoinfo.name()));
+ MIL << format("Repository '%s' has been removed.") % repoinfo.name() << endl;
}
// ----------------------------------------------------------------------------
-bool remove_repo(Zypper & zypper, const std::string &alias )
-{
- list<RepoInfo> repos =
- RepoManager(zypper.globalOpts().rm_options).knownRepositories();
- for (list<RepoInfo>::const_iterator it = repos.begin();
- it != repos.end(); ++it)
- if (it->alias() == alias)
- return remove_repo(zypper, *it);
-
- return false;
-}
-
-bool remove_repo(Zypper & zypper, const Url & url, const url::ViewOption & urlview)
-{
- RepoManager manager(zypper.globalOpts().rm_options);
- bool found = true;
- try
- {
- RepoInfo info = manager.getRepositoryInfo(url, urlview);
- found = remove_repo(zypper, info);
- }
- catch (const repo::RepoNotFoundException & ex)
- {
- found = false;
- }
-
- return found;
-}
-
-// ----------------------------------------------------------------------------
-
void rename_repo(Zypper & zypper,
const std::string & alias, const std::string & newalias)
{
@@ -1327,12 +1297,6 @@
_("Repository '%s' renamed to '%s'.")) % alias % repo.alias()));
MIL << format("Repository '%s' renamed to '%s'") % alias % repo.alias() << endl;
}
- catch (const RepoNotFoundException & ex)
- {
- zypper.out().error(boost::str(format(
- _("Repository '%s' not found.")) % alias));
- ERR << "Repo " << alias << " not found" << endl;
- }
catch (const RepoAlreadyExistsException & ex)
{
zypper.out().error(boost::str(format(
@@ -1413,12 +1377,6 @@
_("Repository %s has been sucessfully modified.")) % alias));
MIL << format("Repository %s modified:") % alias << repo << endl;
}
- catch (const RepoNotFoundException & ex)
- {
- zypper.out().error(
- boost::str(format(_("Repository %s not found.")) % alias));
- ERR << "Repo " << alias << " not found" << endl;
- }
catch (const Exception & ex)
{
zypper.out().error(ex,
@@ -1513,7 +1471,18 @@
zypper.out().info(_("Reading installed packages..."));
MIL << "Going to read RPM database" << endl;
- God->target()->load();
+ try
+ {
+ God->target()->load();
+ }
+ catch ( const Exception & e )
+ {
+ ZYPP_CAUGHT(e);
+ zypper.out().error(e,
+ _("Problem occured while reading the installed packages:"),
+ _("Please see the above error message for a hint."));
+ zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP);
+ }
}
// ---------------------------------------------------------------------------
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.10.2/src/zypper-repos.h new/zypper-0.10.3/src/zypper-repos.h
--- old/zypper-0.10.2/src/zypper-repos.h 2008-02-29 17:46:24.000000000 +0100
+++ new/zypper-0.10.3/src/zypper-repos.h 2008-03-09 21:43:54.000000000 +0100
@@ -4,6 +4,7 @@
#include
#include "zypp/Url.h"
+#include "zypp/RepoInfo.h"
#include "zypper.h"
@@ -38,6 +39,15 @@
*/
void clean_repos(Zypper & zypper);
+/**
+ * Try match given string with any known repository.
+ *
+ * \param str string to match
+ * \param repo pointer to fill with found repository
+ * \return success if respository is found
+ */
+bool match_repo(Zypper & zypper, const std::string str, zypp::RepoInfo *repo);
+
/**
* Add repository specified by \url to system repositories.
@@ -77,12 +87,7 @@
/**
* Remove repository specified by \a alias.
*/
-bool remove_repo(Zypper & zypper, const std::string &alias );
-
-bool remove_repo(Zypper & zypper,
- const zypp::Url & url, const zypp::url::ViewOption & urlview);
-
-bool remove_repo(Zypper & zypper, const zypp::RepoInfo & repoinfo);
+void remove_repo(Zypper & zypper, const zypp::RepoInfo & repoinfo);
/**
* Rename repository specified by \a alias to \a newalias.
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.10.2/VERSION.cmake new/zypper-0.10.3/VERSION.cmake
--- old/zypper-0.10.2/VERSION.cmake 2008-02-29 17:46:24.000000000 +0100
+++ new/zypper-0.10.3/VERSION.cmake 2008-03-09 21:43:55.000000000 +0100
@@ -20,4 +20,4 @@
SET(VERSION_MAJOR "0")
SET(VERSION_MINOR "10")
-SET(VERSION_PATCH "2")
+SET(VERSION_PATCH "3")
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.10.2/zypper.spec.cmake new/zypper-0.10.3/zypper.spec.cmake
--- old/zypper-0.10.2/zypper.spec.cmake 2008-02-29 17:46:24.000000000 +0100
+++ new/zypper-0.10.3/zypper.spec.cmake 2008-03-09 21:43:55.000000000 +0100
@@ -84,6 +84,7 @@
%files -f zypper.lang
%defattr(-,root,root)
%{_sysconfdir}/logrotate.d/zypper.lr
+%{_sysconfdir}/bash_completion.d/zypper.sh
%{_bindir}/zypper
%{_bindir}/installation_sources
%{_sbindir}/zypp-checkpatches
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org