Hello community,
here is the log from the commit of package yast2-pkg-bindings for openSUSE:Factory
checked in at Wed Jan 14 01:59:50 CET 2009.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-12-15 13:45:08.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2009-01-13 15:34:02.998113000 +0100
@@ -1,0 +2,19 @@
+Tue Jan 13 15:30:22 CET 2009 - lslezak@suse.cz
+
+- 2.18.0
+
+-------------------------------------------------------------------
+Tue Jan 6 12:30:01 CET 2009 - lslezak@suse.cz
+
+- Translate the help texts displayed when loading/saving the
+ package manager (bnc#446054)
+- Copy the global and user's credentials (user names and passwords)
+ to the target system (bnc#460970)
+
+-------------------------------------------------------------------
+Mon Dec 22 16:49:36 CET 2008 - lslezak@suse.cz
+
+- call the refresh callbacks only when there is something to
+ refresh (bnc#441512)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-pkg-bindings-2.17.32.tar.bz2
New:
----
yast2-pkg-bindings-2.18.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.gB4426/_old 2009-01-14 01:59:34.000000000 +0100
+++ /var/tmp/diff_new_pack.gB4426/_new 2009-01-14 01:59:34.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-pkg-bindings-devel-doc (Version 2.17.32)
+# spec file for package yast2-pkg-bindings-devel-doc (Version 2.18.0)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,12 +19,12 @@
Name: yast2-pkg-bindings-devel-doc
-Version: 2.17.32
+Version: 2.18.0
Release: 1
License: GPL v2 or later
Group: Documentation/HTML
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.17.32.tar.bz2
+Source0: yast2-pkg-bindings-2.18.0.tar.bz2
Prefix: %_prefix
# same as in the main package (because we use the same configure.in.in)
BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools
@@ -45,7 +45,7 @@
Ladislav Slez�k
%prep
-%setup -n yast2-pkg-bindings-2.17.32
+%setup -n yast2-pkg-bindings-2.18.0
# build only documentation, ignore all other directories
echo "doc" > SUBDIRS
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.gB4426/_old 2009-01-14 01:59:34.000000000 +0100
+++ /var/tmp/diff_new_pack.gB4426/_new 2009-01-14 01:59:34.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.17.32)
+# spec file for package yast2-pkg-bindings (Version 2.18.0)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,12 +19,12 @@
Name: yast2-pkg-bindings
-Version: 2.17.32
+Version: 2.18.0
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.17.32.tar.bz2
+Source0: yast2-pkg-bindings-2.18.0.tar.bz2
Prefix: /usr
BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools
BuildRequires: libzypp-devel >= 5.24.7
@@ -47,7 +47,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-pkg-bindings-2.17.32
+%setup -n yast2-pkg-bindings-2.18.0
# build only the library, ignore documentation (it is in devel-doc package)
echo "src" > SUBDIRS
@@ -79,6 +79,16 @@
%{_libdir}/YaST2/plugin/libpy2Pkg.so
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog
+* Tue Jan 13 2009 lslezak@suse.cz
+- 2.18.0
+* Tue Jan 06 2009 lslezak@suse.cz
+- Translate the help texts displayed when loading/saving the
+ package manager (bnc#446054)
+- Copy the global and user's credentials (user names and passwords)
+ to the target system (bnc#460970)
+* Mon Dec 22 2008 lslezak@suse.cz
+- call the refresh callbacks only when there is something to
+ refresh (bnc#441512)
* Mon Dec 15 2008 lslezak@suse.cz
- Pkg::SetSolverFlags() - support for "reset" key in the map
for resetting the solver and the fixsystem mode (bnc#439373)
++++++ yast2-pkg-bindings-2.17.32.tar.bz2 -> yast2-pkg-bindings-2.18.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.32/configure new/yast2-pkg-bindings-2.18.0/configure
--- old/yast2-pkg-bindings-2.17.32/configure 2008-12-15 13:32:08.000000000 +0100
+++ new/yast2-pkg-bindings-2.18.0/configure 2009-01-13 15:30:57.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-pkg-bindings 2.17.32.
+# Generated by GNU Autoconf 2.63 for yast2-pkg-bindings 2.18.0.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -745,8 +745,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-pkg-bindings'
PACKAGE_TARNAME='yast2-pkg-bindings'
-PACKAGE_VERSION='2.17.32'
-PACKAGE_STRING='yast2-pkg-bindings 2.17.32'
+PACKAGE_VERSION='2.18.0'
+PACKAGE_STRING='yast2-pkg-bindings 2.18.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1536,7 +1536,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-pkg-bindings 2.17.32 to adapt to many kinds of systems.
+\`configure' configures yast2-pkg-bindings 2.18.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1608,7 +1608,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-pkg-bindings 2.17.32:";;
+ short | recursive ) echo "Configuration of yast2-pkg-bindings 2.18.0:";;
esac
cat <<\_ACEOF
@@ -1720,7 +1720,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-pkg-bindings configure 2.17.32
+yast2-pkg-bindings configure 2.18.0
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1734,7 +1734,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-pkg-bindings $as_me 2.17.32, which was
+It was created by yast2-pkg-bindings $as_me 2.18.0, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2581,7 +2581,7 @@
# Define the identity of the package.
PACKAGE='yast2-pkg-bindings'
- VERSION='2.17.32'
+ VERSION='2.18.0'
cat >>confdefs.h <<_ACEOF
@@ -2805,7 +2805,7 @@
-VERSION="2.17.32"
+VERSION="2.18.0"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
@@ -17209,7 +17209,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-pkg-bindings $as_me 2.17.32, which was
+This file was extended by yast2-pkg-bindings $as_me 2.18.0, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17272,7 +17272,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-pkg-bindings config.status 2.17.32
+yast2-pkg-bindings config.status 2.18.0
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.32/configure.in new/yast2-pkg-bindings-2.18.0/configure.in
--- old/yast2-pkg-bindings-2.17.32/configure.in 2008-12-15 13:31:54.000000000 +0100
+++ new/yast2-pkg-bindings-2.18.0/configure.in 2009-01-13 15:30:43.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 2.17.32, http://bugs.opensuse.org/, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.18.0, http://bugs.opensuse.org/, yast2-pkg-bindings)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.32"
+VERSION="2.18.0"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.32/src/PkgFunctions.h new/yast2-pkg-bindings-2.18.0/src/PkgFunctions.h
--- old/yast2-pkg-bindings-2.17.32/src/PkgFunctions.h 2008-12-04 15:48:12.000000000 +0100
+++ new/yast2-pkg-bindings-2.18.0/src/PkgFunctions.h 2009-01-06 17:14:01.000000000 +0100
@@ -129,6 +129,11 @@
std::string zypp2yastType(const std::string &type);
std::string yast2zyppType(const std::string &type);
+ // helper - create a directory if it doesn't exist
+ bool CreateDir(const std::string &path);
+ // helper - copy a file or directory
+ bool CopyToDir(const std::string &source, const std::string &target, bool backup = false, bool recursive = true);
+
void RemoveResolvablesFrom(const std::string &alias);
bool AnyResolvableFrom(const std::string &alias);
bool LoadResolvablesFrom(const zypp::RepoInfo &repoinfo, const zypp::ProgressData::ReceiverFnc & progressrcv = zypp::ProgressData::ReceiverFnc(), bool network_check = false);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.32/src/Source_Create.cc new/yast2-pkg-bindings-2.18.0/src/Source_Create.cc
--- old/yast2-pkg-bindings-2.17.32/src/Source_Create.cc 2008-12-15 13:31:08.000000000 +0100
+++ new/yast2-pkg-bindings-2.18.0/src/Source_Create.cc 2009-01-06 12:43:33.000000000 +0100
@@ -19,7 +19,7 @@
*/
/*
- File: $Id: Source_Create.cc 54117 2008-12-15 12:31:08Z lslezak $
+ File: $Id: Source_Create.cc 54392 2009-01-06 11:43:32Z lslezak $
Author: Ladislav Slezák
Summary: Functions related to repository registration
Namespace: Pkg
@@ -620,7 +620,7 @@
stages.push_back(_("Load Data"));
}
- pkgprogress.Start(_("Adding the Repository..."), stages, HelpTexts::create_help);
+ pkgprogress.Start(_("Adding the Repository..."), stages, _(HelpTexts::create_help));
zypp::ProgressData prg(100);
prg.sendTo(pkgprogress.Receiver());
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.32/src/Source_Download.cc new/yast2-pkg-bindings-2.18.0/src/Source_Download.cc
--- old/yast2-pkg-bindings-2.17.32/src/Source_Download.cc 2008-11-27 11:00:16.000000000 +0100
+++ new/yast2-pkg-bindings-2.18.0/src/Source_Download.cc 2009-01-06 12:43:33.000000000 +0100
@@ -19,7 +19,7 @@
*/
/*
- File: $Id: Source_Download.cc 53642 2008-11-27 10:00:16Z lslezak $
+ File: $Id: Source_Download.cc 54392 2009-01-06 11:43:32Z lslezak $
Author: Ladislav Slezák
Summary: Functions for downloading files from a repository
Namespace: Pkg
@@ -408,7 +408,7 @@
prog_total.sendTo(pkgprogress.Receiver());
// 3 steps per repository (download, cache rebuild, load resolvables)
- pkgprogress.Start(_("Refreshing Repository..."), stages, HelpTexts::refresh_help);
+ pkgprogress.Start(_("Refreshing Repository..."), stages, _(HelpTexts::refresh_help));
try
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.32/src/Source_Installation.cc new/yast2-pkg-bindings-2.18.0/src/Source_Installation.cc
--- old/yast2-pkg-bindings-2.17.32/src/Source_Installation.cc 2008-11-27 11:00:16.000000000 +0100
+++ new/yast2-pkg-bindings-2.18.0/src/Source_Installation.cc 2009-01-06 17:23:19.000000000 +0100
@@ -19,7 +19,7 @@
*/
/*
- File: $Id: Source_Installation.cc 53642 2008-11-27 10:00:16Z lslezak $
+ File: $Id: Source_Installation.cc 54407 2009-01-06 16:23:19Z lslezak $
Author: Ladislav Slezák
Summary: Functions used during system installation
Namespace: Pkg
@@ -34,6 +34,17 @@
#include
#include
+extern "C"
+{
+// stat()
+#include
+// errno
+#include
+}
+
+// getenv()
+#include <cstdlib>
+
/*
Textdomain "pkg-bindings"
*/
@@ -51,7 +62,153 @@
return YCPBoolean( true );
}
+bool PkgFunctions::CreateDir(const std::string &path)
+{
+ if (path.empty())
+ {
+ y2error("Empty directory path");
+ return false;
+ }
+
+ // check if the target exists
+ struct stat stat_buf;
+ if (::stat(path.c_str(), &stat_buf) == 0)
+ {
+ // it exists, is it a directory?
+ if (S_ISDIR(stat_buf.st_mode))
+ {
+ return true;
+ }
+ else
+ {
+ // error message (followed by directory name)
+ _last_error.setLastError(_("Target is not a directory: ") + path);
+ y2error("Target %s exists but it's not a directory", path.c_str());
+ return false;
+ }
+ }
+ else
+ {
+ // "No such file or directory" error, the target doesn't exist
+ if (errno == ENOENT)
+ {
+ y2milestone("Creating directory %s...", path.c_str());
+
+ const char* argv[] =
+ {
+ "mkdir",
+ // create parent dir
+ "-p",
+ // finish parameter list
+ "--",
+ // target
+ path.c_str(),
+ NULL
+ };
+
+ // discard stderr, no pty, stderr_fd = -1, use the default locale
+ zypp::ExternalProgram prog(argv, zypp::ExternalProgram::Discard_Stderr, false, -1, true);
+
+ if (prog.close())
+ {
+ // error message (followed by directory name)
+ _last_error.setLastError(_("Cannot create directory ") + path);
+ y2error("Cannot create target directory %s", path.c_str());
+ return false;
+ }
+ }
+ // other error
+ else
+ {
+ // error message (followed by directory name)
+ _last_error.setLastError(_("Cannot check status of directory ") + path);
+ y2error("Cannot stat %s: %s", path.c_str(), ::strerror(errno));
+ return false;
+ }
+ }
+
+ return true;
+}
+
+bool PkgFunctions::CopyToDir(const std::string &source, const std::string &target, bool backup, bool recursive)
+{
+ if (source.empty())
+ {
+ y2error("CopyToDir: Empty source parameter");
+ return false;
+ }
+
+ if (target.empty())
+ {
+ y2error("CopyToDir: Empty target parameter");
+ return false;
+ }
+
+ // check if the source exists
+ struct stat stat_buf;
+ if (::stat(source.c_str(), &stat_buf) != 0 && errno == ENOENT)
+ {
+ y2milestone("Source %s does not exist, skipping", source.c_str());
+ return true;
+ }
+
+ // create the target directory
+ if (!CreateDir(target))
+ {
+ return false;
+ }
+
+ const char* argv[] =
+ {
+ "cp",
+ // preserve the time stamps and permissions
+ "-a",
+ // fill the parameters later
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL
+ };
+
+ int pos = 2;
+
+ if (recursive)
+ {
+ argv[pos++] = "-r";
+ }
+
+ if (backup)
+ {
+ argv[pos++] = "-b";
+ }
+
+ // finish parameter list
+ argv[pos++] = "--";
+
+ // source
+ argv[pos++] = source.c_str();
+
+ // target
+ argv[pos++] = target.c_str();
+
+ // discard stderr, no pty, stderr_fd = -1, use the default locale
+ zypp::ExternalProgram prog(argv, zypp::ExternalProgram::Discard_Stderr, false, -1, true);
+
+ if (prog.close())
+ {
+ // error message (followed by detailed description)
+ const std::string msg = _("Error: Cannot copy the cache to the target directory\n");
+ // error message
+ _last_error.setLastError(msg + _("Copying failed"));
+ y2error("Cannot copy %s to %s", source.c_str(), target.c_str());
+ return false;
+ }
+
+ return true;
+}
/****************************************************************************************
* @builtin SourceCacheCopyTo
@@ -70,7 +227,7 @@
// error message (followed by detailed description)
const std::string msg = _("Error: Cannot copy the cache to the target directory\n");
- std::string d = dir->value();
+ std::string d(dir->value());
y2milestone("Copying source cache to '%s'...", d.c_str());
if (d.empty())
@@ -79,64 +236,46 @@
return YCPBoolean(false);
}
- std::string target = d + "/var/cache";
-
- // create the target dir
- const char* argv[] =
+ if (!CreateDir(d))
{
- "mkdir",
- // create parent dir
- "-p",
- // finish parameter list
- "--",
- // target
- target.c_str(),
- NULL
- };
-
- // discard stderr, no pty, stderr_fd = -1, use the default locale
- zypp::ExternalProgram prog(argv, zypp::ExternalProgram::Discard_Stderr, false, -1, true);
-
- int code = prog.close();
-
- if (code)
- {
- // error message (followed by directory name)
- _last_error.setLastError(msg + _("Cannot create directory ") + target);
- y2error("Cannot create target directory %s", target.c_str());
return YCPBoolean(false);
}
+ std::string target(d + "/var/cache");
+
// copy /var/cache/zypp to the target system
- const char* argv2[] =
+ if (!CopyToDir("/var/cache/zypp", target))
{
- "cp",
- // preserve time stamps
- "-a",
- // recursive
- "-r",
- // finish parameter list
- "--",
- // source
- "/var/cache/zypp",
- // target
- target.c_str(),
- NULL
- };
+ return YCPBoolean(false);
+ }
- // discard stderr, no pty, stderr_fd = -1, use the default locale
- zypp::ExternalProgram prog2(argv2, zypp::ExternalProgram::Discard_Stderr, false, -1, true);
+ // copy optional files in /etc/zypp/credentials.d directory
+ std::string source_cred("/etc/zypp/credentials.d");
+ std::string target_cred(d + "/etc/zypp");
- int code2 = prog2.close();
+ // true = backup target files
+ if (!CopyToDir(source_cred, target_cred, true))
+ {
+ return YCPBoolean(false);
+ }
- if (code2)
+ // copy user's credentials
+ char *homedir = ::getenv("HOME");
+ if (homedir)
{
- // error message
- _last_error.setLastError(msg + _("Copying failed"));
- y2error("Cannot copy /var/cache/zypp to %s", d.c_str());
+ // see file zypp/media/CredentialManager.cc for the user's file definition
+ source_cred = std::string(homedir) + "/.zypp/credentials.cat";
+ target_cred = d + homedir + "/.zypp";
+
+ // copy optional files in $HOME/.zypp/credentials.cat file
+ // true = backup target files
+ if (!CopyToDir(source_cred, target_cred, true))
+ {
+ return YCPBoolean(false);
+ }
}
- return YCPBoolean(!code2);
+ return YCPBoolean(true);
}
/****************************************************************************************
* @builtin SourceMoveDownloadArea
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.32/src/Source_Load.cc new/yast2-pkg-bindings-2.18.0/src/Source_Load.cc
--- old/yast2-pkg-bindings-2.17.32/src/Source_Load.cc 2008-10-09 15:23:20.000000000 +0200
+++ new/yast2-pkg-bindings-2.18.0/src/Source_Load.cc 2009-01-06 12:43:33.000000000 +0100
@@ -19,7 +19,7 @@
*/
/*
- File: $Id: Source_Load.cc 51795 2008-10-02 13:39:41Z lslezak $
+ File: $Id: Source_Load.cc 54392 2009-01-06 11:43:32Z lslezak $
Author: Ladislav Slezák
Summary: Functions for initializing the package manager
Namespace: Pkg
@@ -170,7 +170,7 @@
PkgProgress pkgprogress(_callbackHandler);
// 3 steps per repository (download, cache rebuild, load resolvables)
- pkgprogress.Start(_("Loading the Package Manager..."), stages, HelpTexts::load_resolvables);
+ pkgprogress.Start(_("Loading the Package Manager..."), stages, _(HelpTexts::load_resolvables));
YCPValue ret = SourceLoadImpl(pkgprogress);
@@ -242,8 +242,8 @@
zypp::RepoManager repomanager = CreateRepoManager();
autorefresh_skipped = false;
- CallRefreshStarted();
+ bool refresh_started_called = false;
bool network_is_running = NetworkDetected();
if (repos_to_refresh > 0)
@@ -289,6 +289,12 @@
{
y2milestone("Autorefreshing source: %s", (*it)->repoInfo().alias().c_str());
// refresh the repository
+ if (!refresh_started_called)
+ {
+ // call the init callback
+ CallRefreshStarted();
+ refresh_started_called = true;
+ }
RefreshWithCallbacks((*it)->repoInfo(), prog.receiver());
}
// NOTE: subtask progresses are reported as done in the destructor
@@ -397,7 +403,11 @@
}
}
- CallRefreshDone();
+ if (refresh_started_called)
+ {
+ // call the finish callback
+ CallRefreshDone();
+ }
progress.NextStage();
@@ -458,7 +468,7 @@
stages.push_back(_("Load Data"));
// 3 steps per repository (download, cache rebuild, load resolvables)
- pkgprogress.Start(_("Loading the Package Manager..."), stages, HelpTexts::load_resolvables);
+ pkgprogress.Start(_("Loading the Package Manager..."), stages, _(HelpTexts::load_resolvables));
}
YCPValue ret = SourceStartManagerImpl(enable, pkgprogress);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.32/src/Source_Save.cc new/yast2-pkg-bindings-2.18.0/src/Source_Save.cc
--- old/yast2-pkg-bindings-2.17.32/src/Source_Save.cc 2008-11-27 11:00:16.000000000 +0100
+++ new/yast2-pkg-bindings-2.18.0/src/Source_Save.cc 2009-01-06 12:43:33.000000000 +0100
@@ -19,7 +19,7 @@
*/
/*
- File: $Id: Source_Save.cc 53642 2008-11-27 10:00:16Z lslezak $
+ File: $Id: Source_Save.cc 54392 2009-01-06 11:43:32Z lslezak $
Author: Ladislav Slezák
Summary: Functions for saving repository configuration
Namespace: Pkg
@@ -142,7 +142,7 @@
prog_total.sendTo(pkgprogress.Receiver());
// start the process
- pkgprogress.Start(_("Saving Repositories..."), stages, HelpTexts::save_help);
+ pkgprogress.Start(_("Saving Repositories..."), stages, _(HelpTexts::save_help));
// remove deleted repos (the old configurations) at first
for (RepoCont::iterator it = repos.begin();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.32/src/Source_Set.cc new/yast2-pkg-bindings-2.18.0/src/Source_Set.cc
--- old/yast2-pkg-bindings-2.17.32/src/Source_Set.cc 2008-11-12 15:37:48.000000000 +0100
+++ new/yast2-pkg-bindings-2.18.0/src/Source_Set.cc 2009-01-06 12:43:33.000000000 +0100
@@ -19,7 +19,7 @@
*/
/*
- File: $Id: Source_Set.cc 53211 2008-11-12 14:34:46Z lslezak $
+ File: $Id: Source_Set.cc 54392 2009-01-06 11:43:32Z lslezak $
Author: Ladislav Slezák
Summary: Functions for changing properties of a repository
Namespace: Pkg
@@ -80,7 +80,7 @@
prog_total.sendTo(pkgprogress.Receiver());
zypp::CombinedProgressData load_subprogress(prog_total, 100);
- pkgprogress.Start(_("Loading the Package Manager..."), stages, HelpTexts::load_resolvables);
+ pkgprogress.Start(_("Loading the Package Manager..."), stages, _(HelpTexts::load_resolvables));
success = LoadResolvablesFrom(repo->repoInfo(), load_subprogress);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.32/src/Target_Load.cc new/yast2-pkg-bindings-2.18.0/src/Target_Load.cc
--- old/yast2-pkg-bindings-2.17.32/src/Target_Load.cc 2008-10-09 15:23:53.000000000 +0200
+++ new/yast2-pkg-bindings-2.18.0/src/Target_Load.cc 2009-01-06 12:43:33.000000000 +0100
@@ -19,7 +19,7 @@
*/
/*
- File: $Id: Target_Load.cc 52029 2008-10-09 13:23:51Z lslezak $
+ File: $Id: Target_Load.cc 54392 2009-01-06 11:43:32Z lslezak $
Author: Ladislav Slezák
Summary: Functions for initializing the package manager (target system)
Namespace: Pkg
@@ -59,7 +59,7 @@
stages.push_back(_("Read Installed Packages"));
PkgProgress pkgprogress(_callbackHandler);
- pkgprogress.Start(_("Loading the Package Manager..."), stages, HelpTexts::load_target);
+ pkgprogress.Start(_("Loading the Package Manager..."), stages, _(HelpTexts::load_target));
try
{
@@ -175,7 +175,7 @@
PkgProgress pkgprogress(_callbackHandler);
- pkgprogress.Start(_("Loading the Package Manager..."), stages, HelpTexts::load_target);
+ pkgprogress.Start(_("Loading the Package Manager..."), stages, _(HelpTexts::load_target));
try
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.32/VERSION new/yast2-pkg-bindings-2.18.0/VERSION
--- old/yast2-pkg-bindings-2.17.32/VERSION 2008-12-15 13:31:26.000000000 +0100
+++ new/yast2-pkg-bindings-2.18.0/VERSION 2009-01-13 15:30:14.000000000 +0100
@@ -1 +1 @@
-2.17.32
+2.18.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org