Hello community,
here is the log from the commit of package yast2-pkg-bindings for
openSUSE:Factory checked in at 2015-02-16 15:24:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-pkg-bindings (Old)
and /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-pkg-bindings"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-pkg-bindings/yast2-pkg-bindings.changes
2014-09-28 19:56:52.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new/yast2-pkg-bindings.changes
2015-02-16 17:50:54.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Feb 6 11:12:30 UTC 2015 - [email protected]
+
+- Pkg::RepositoryAdd: use alias from URL query parameter if present
+ (bnc#892431)
+- 3.1.21
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-3.1.20.tar.bz2
New:
----
yast2-pkg-bindings-3.1.21.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.llLuSS/_old 2015-02-16 17:50:55.000000000 +0100
+++ /var/tmp/diff_new_pack.llLuSS/_new 2015-02-16 17:50:55.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-pkg-bindings-devel-doc
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -17,7 +17,7 @@
Name: yast2-pkg-bindings-devel-doc
-Version: 3.1.20
+Version: 3.1.21
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-pkg-bindings-%{version}.tar.bz2
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.llLuSS/_old 2015-02-16 17:50:55.000000000 +0100
+++ /var/tmp/diff_new_pack.llLuSS/_new 2015-02-16 17:50:55.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-pkg-bindings
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -17,7 +17,7 @@
Name: yast2-pkg-bindings
-Version: 3.1.20
+Version: 3.1.21
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-pkg-bindings-3.1.20.tar.bz2 -> yast2-pkg-bindings-3.1.21.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-3.1.20/.travis.yml
new/yast2-pkg-bindings-3.1.21/.travis.yml
--- old/yast2-pkg-bindings-3.1.20/.travis.yml 1970-01-01 01:00:00.000000000
+0100
+++ new/yast2-pkg-bindings-3.1.21/.travis.yml 2015-02-13 12:35:11.000000000
+0100
@@ -0,0 +1,15 @@
+language: cpp
+compiler:
+ - gcc
+before_install:
+ # use gcc-4.8 (needed by libzypp) instead of gcc-4.6 default
+ - export CC=gcc-4.8
+ - export CXX=g++-4.8
+ - wget
https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
+ - sh ./travis_setup.sh -p "yast2-core-dev libzypp-dev yast2-devtools
doxygen yast2-testsuite g++-4.8"
+script:
+ - make -f Makefile.cvs
+ - make -j 4
+ - make check
+ - sudo make install
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-3.1.20/README.md
new/yast2-pkg-bindings-3.1.21/README.md
--- old/yast2-pkg-bindings-3.1.20/README.md 1970-01-01 01:00:00.000000000
+0100
+++ new/yast2-pkg-bindings-3.1.21/README.md 2015-02-13 12:35:11.000000000
+0100
@@ -0,0 +1,6 @@
+## YaST - Package Bindings
+
+[](https://travis-ci.org/yast/yast-pkg-bindings)
+[](https://ci.opensuse.org/view/Yast/job/yast-pkg-bindings-master/)
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-pkg-bindings-3.1.20/package/yast2-pkg-bindings-devel-doc.spec
new/yast2-pkg-bindings-3.1.21/package/yast2-pkg-bindings-devel-doc.spec
--- old/yast2-pkg-bindings-3.1.20/package/yast2-pkg-bindings-devel-doc.spec
2014-09-25 17:20:14.000000000 +0200
+++ new/yast2-pkg-bindings-3.1.21/package/yast2-pkg-bindings-devel-doc.spec
2015-02-13 12:35:11.000000000 +0100
@@ -16,7 +16,7 @@
#
Name: yast2-pkg-bindings-devel-doc
-Version: 3.1.20
+Version: 3.1.21
Release: 0
License: GPL-2.0
Group: Documentation/HTML
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-pkg-bindings-3.1.20/package/yast2-pkg-bindings.changes
new/yast2-pkg-bindings-3.1.21/package/yast2-pkg-bindings.changes
--- old/yast2-pkg-bindings-3.1.20/package/yast2-pkg-bindings.changes
2014-09-25 17:20:14.000000000 +0200
+++ new/yast2-pkg-bindings-3.1.21/package/yast2-pkg-bindings.changes
2015-02-13 12:35:11.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Feb 6 11:12:30 UTC 2015 - [email protected]
+
+- Pkg::RepositoryAdd: use alias from URL query parameter if present
+ (bnc#892431)
+- 3.1.21
+
+-------------------------------------------------------------------
Wed Sep 24 18:16:22 CEST 2014 - [email protected]
- Added onsystem_by_user flag in Pkg.PkgProperties and
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-pkg-bindings-3.1.20/package/yast2-pkg-bindings.spec
new/yast2-pkg-bindings-3.1.21/package/yast2-pkg-bindings.spec
--- old/yast2-pkg-bindings-3.1.20/package/yast2-pkg-bindings.spec
2014-09-25 17:20:14.000000000 +0200
+++ new/yast2-pkg-bindings-3.1.21/package/yast2-pkg-bindings.spec
2015-02-13 12:35:11.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-pkg-bindings
-Version: 3.1.20
+Version: 3.1.21
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-3.1.20/src/Callbacks.YCP.cc
new/yast2-pkg-bindings-3.1.21/src/Callbacks.YCP.cc
--- old/yast2-pkg-bindings-3.1.20/src/Callbacks.YCP.cc 2014-09-25
17:20:14.000000000 +0200
+++ new/yast2-pkg-bindings-3.1.21/src/Callbacks.YCP.cc 2015-02-13
12:35:11.000000000 +0100
@@ -102,12 +102,8 @@
ENUM_OUT( StartDeltaApply );
ENUM_OUT( ProgressDeltaApply );
ENUM_OUT( ProblemDeltaApply );
- ENUM_OUT( StartPatchDownload );
- ENUM_OUT( ProgressPatchDownload );
- ENUM_OUT( ProblemPatchDownload );
ENUM_OUT( FinishDeltaDownload );
ENUM_OUT( FinishDeltaApply );
- ENUM_OUT( FinishPatchDownload );
ENUM_OUT( MediaChange );
ENUM_OUT( SourceChange );
ENUM_OUT( ResolvableReport );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-3.1.20/src/Callbacks.YCP.h
new/yast2-pkg-bindings-3.1.21/src/Callbacks.YCP.h
--- old/yast2-pkg-bindings-3.1.20/src/Callbacks.YCP.h 2014-09-25
17:20:14.000000000 +0200
+++ new/yast2-pkg-bindings-3.1.21/src/Callbacks.YCP.h 2015-02-13
12:35:11.000000000 +0100
@@ -78,8 +78,7 @@
CB_StartSourceRefresh, CB_ErrorSourceRefresh, CB_DoneSourceRefresh,
CB_ProgressSourceRefresh,
CB_StartDeltaDownload, CB_ProgressDeltaDownload, CB_ProblemDeltaDownload,
CB_StartDeltaApply, CB_ProgressDeltaApply, CB_ProblemDeltaApply,
- CB_StartPatchDownload, CB_ProgressPatchDownload, CB_ProblemPatchDownload,
- CB_FinishDeltaDownload, CB_FinishDeltaApply, CB_FinishPatchDownload,
+ CB_FinishDeltaDownload, CB_FinishDeltaApply,
CB_StartDownload, CB_ProgressDownload, CB_DoneDownload, CB_InitDownload,
CB_DestDownload,
CB_SourceProbeStart, CB_SourceProbeFailed, CB_SourceProbeSucceeded,
CB_SourceProbeEnd, CB_SourceProbeProgress, CB_SourceProbeError,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-3.1.20/src/Callbacks.cc
new/yast2-pkg-bindings-3.1.21/src/Callbacks.cc
--- old/yast2-pkg-bindings-3.1.20/src/Callbacks.cc 2014-09-25
17:20:14.000000000 +0200
+++ new/yast2-pkg-bindings-3.1.21/src/Callbacks.cc 2015-02-13
12:35:11.000000000 +0100
@@ -704,64 +704,6 @@
callback.evaluate();
}
}
-
-
- // Download patch rpm:
- // - path below url reported on start()
- // - expected download size (0 if unknown)
- // - download is interruptable
- virtual void startPatchDownload( const zypp::Pathname & filename, const
zypp::ByteCount & downloadsize )
- {
- // reset the counter
- last_reported_patch_download = 0;
- last_reported_patch_download_time = time(NULL);
-
- CB callback( ycpcb( YCPCallbacks::CB_StartPatchDownload ) );
- if (callback._set) {
- callback.addStr( filename.asString() );
- callback.addInt( downloadsize );
-
- callback.evaluate();
- }
- }
-
- virtual bool progressPatchDownload( int value )
- {
- CB callback( ycpcb( YCPCallbacks::CB_ProgressPatchDownload) );
- time_t current_time = time(NULL);
- if (callback._set && (value - last_reported_patch_download >= 5 ||
last_reported_patch_download - value >= 5 || value == 100 || current_time -
last_reported_patch_download_time >= callback_timeout))
- {
- last_reported_patch_download = value;
- last_reported_patch_download_time = current_time;
- callback.addInt( value );
-
- return callback.evaluateBool();
- }
-
- return
zypp::repo::DownloadResolvableReport::progressPatchDownload(value);
- }
-
- virtual void problemPatchDownload( const std::string &description )
- {
- CB callback( ycpcb( YCPCallbacks::CB_ProblemPatchDownload ) );
-
- if (callback._set) {
- callback.addStr( description );
-
- callback.evaluate();
- }
- }
-
- virtual void finishPatchDownload()
- {
- CB callback( ycpcb( YCPCallbacks::CB_FinishPatchDownload ) );
-
- if (callback._set)
- {
- callback.evaluate();
- }
- }
-
};
///////////////////////////////////////////////////////////////////
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-3.1.20/src/Callbacks_Register.cc
new/yast2-pkg-bindings-3.1.21/src/Callbacks_Register.cc
--- old/yast2-pkg-bindings-3.1.20/src/Callbacks_Register.cc 2014-09-25
17:20:14.000000000 +0200
+++ new/yast2-pkg-bindings-3.1.21/src/Callbacks_Register.cc 2015-02-13
12:35:11.000000000 +0100
@@ -303,32 +303,32 @@
/**
* @builtin CallbackStartPatchDownload
- * @short Register callback function
+ * @short Register callback function (legacy, not used anymore)
* @param string args Name of the callback handler function. Required callback
prototype is <code>void(string filename, integer download_size)</code>. If the
download size is unknown download_size is 0. The callback function is evaluated
when a patch download has been started.
* @return void
*/
YCPValue PkgFunctions::CallbackStartPatchDownload( const YCPValue& args ) {
- return SET_YCP_CB( CB_StartPatchDownload, args);
+ return YCPVoid();
}
/**
* @builtin CallbackProgressPatchDownload
- * @short Register callback function
+ * @short Register callback function (legacy, not used anymore)
* @param string args Name of the callback handler function. Required callback
prototype is <code>boolean(integer value)</code>. The callback function is
evaluated when more than 5% of the patch size has been downloaded since the
last evaluation. If the handler returns false the download is aborted.
* @return void
*/
YCPValue PkgFunctions::CallbackProgressPatchDownload( const YCPValue& args ) {
- return SET_YCP_CB( CB_ProgressPatchDownload, args);
+ return YCPVoid();
}
/**
* @builtin CallbackProblemPatchDownload
- * @short Register callback function
+ * @short Register callback function (legacy, not used anymore)
* @param string args Name of the callback handler function. Required callback
prototype is <code>void(string description)</code>. The callback function
should inform user that a problem has occurred during download of the patch.
* @return void
*/
YCPValue PkgFunctions::CallbackProblemPatchDownload( const YCPValue& args ) {
- return SET_YCP_CB( CB_ProblemPatchDownload, args);
+ return YCPVoid();
}
@@ -356,13 +356,13 @@
/**
* @builtin CallbackFinishPatchDownload
- * @short Register callback function
+ * @short Register callback function (legacy, not used anymore)
* @param string args Name of the callback handler function. Required callback
prototype is <code>void()</code>. The callback function is evaluated when the
patch download has been finished.
* @return void
*/
YCPValue PkgFunctions::CallbackFinishPatchDownload( const YCPValue& args)
{
- return SET_YCP_CB( CB_FinishPatchDownload, args);
+ return YCPVoid();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-3.1.20/src/Source_Create.cc
new/yast2-pkg-bindings-3.1.21/src/Source_Create.cc
--- old/yast2-pkg-bindings-3.1.20/src/Source_Create.cc 2014-09-25
17:20:14.000000000 +0200
+++ new/yast2-pkg-bindings-3.1.21/src/Source_Create.cc 2015-02-13
12:35:11.000000000 +0100
@@ -327,6 +327,7 @@
YCPValue PkgFunctions::RepositoryAdd(const YCPMap ¶ms)
{
zypp::RepoInfo repo;
+ std::string alias;
// turn on the repo by default
repo.setEnabled(true);
@@ -373,6 +374,7 @@
if (!name.empty())
{
repo.setName(name);
+ alias = name;
url = url_new;
}
@@ -400,8 +402,6 @@
return YCPVoid();
}
- std::string alias;
-
if (!params->value( YCPString("alias") ).isNull() &&
params->value(YCPString("alias"))->isString())
{
alias = params->value(YCPString("alias"))->asString()->value();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-3.1.20/src/Source_Set.cc
new/yast2-pkg-bindings-3.1.21/src/Source_Set.cc
--- old/yast2-pkg-bindings-3.1.20/src/Source_Set.cc 2014-09-25
17:20:14.000000000 +0200
+++ new/yast2-pkg-bindings-3.1.21/src/Source_Set.cc 2015-01-27
14:10:27.000000000 +0100
@@ -241,15 +241,14 @@
if (repo->repoInfo().baseUrlsSize() > 1)
{
// store current urls
- std::set<zypp::Url> baseUrls (repo->repoInfo().baseUrlsBegin(),
repo->repoInfo().baseUrlsEnd());
-
+ const zypp::RepoInfo::url_set & baseUrls((
repo->repoInfo().baseUrls() ));
+
// reset url list and store the new one there
repo->repoInfo().setBaseUrl(zypp::Url(u->value()));
// add the rest of base urls
- for (std::set<zypp::Url>::const_iterator i = baseUrls.begin();
- i != baseUrls.end(); ++i)
- repo->repoInfo().addBaseUrl(*i);
+ for ( const auto & url : baseUrls )
+ repo->repoInfo().addBaseUrl(url);
}
else
repo->repoInfo().setBaseUrl(zypp::Url(u->value()));
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
