Hello community,
here is the log from the commit of package yast2-pkg-bindings for
openSUSE:Factory checked in at 2014-01-11 11:12:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2013-12-18 11:52:02.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new/yast2-pkg-bindings.changes
2014-01-11 11:12:41.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Jan 10 09:02:41 UTC 2014 - [email protected]
+
+- zypp::filesystem::TmpDir::defaultLocation() already contains
+ /var/tmp/ prefix, do not use it it twice (bnc#847794)
+- 3.1.3
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-3.1.2.tar.bz2
New:
----
yast2-pkg-bindings-3.1.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.21F0vv/_old 2014-01-11 11:12:42.000000000 +0100
+++ /var/tmp/diff_new_pack.21F0vv/_new 2014-01-11 11:12:42.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-pkg-bindings-devel-doc
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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.2
+Version: 3.1.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-pkg-bindings-%{version}.tar.bz2
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.21F0vv/_old 2014-01-11 11:12:42.000000000 +0100
+++ /var/tmp/diff_new_pack.21F0vv/_new 2014-01-11 11:12:42.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-pkg-bindings
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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.2
+Version: 3.1.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-pkg-bindings-3.1.2.tar.bz2 -> yast2-pkg-bindings-3.1.3.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-pkg-bindings-3.1.2/package/yast2-pkg-bindings-devel-doc.spec
new/yast2-pkg-bindings-3.1.3/package/yast2-pkg-bindings-devel-doc.spec
--- old/yast2-pkg-bindings-3.1.2/package/yast2-pkg-bindings-devel-doc.spec
2013-12-18 09:36:43.000000000 +0100
+++ new/yast2-pkg-bindings-3.1.3/package/yast2-pkg-bindings-devel-doc.spec
2014-01-10 11:11:00.000000000 +0100
@@ -16,7 +16,7 @@
#
Name: yast2-pkg-bindings-devel-doc
-Version: 3.1.2
+Version: 3.1.3
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.2/package/yast2-pkg-bindings.changes
new/yast2-pkg-bindings-3.1.3/package/yast2-pkg-bindings.changes
--- old/yast2-pkg-bindings-3.1.2/package/yast2-pkg-bindings.changes
2013-12-18 09:36:43.000000000 +0100
+++ new/yast2-pkg-bindings-3.1.3/package/yast2-pkg-bindings.changes
2014-01-10 11:11:00.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Jan 10 09:02:41 UTC 2014 - [email protected]
+
+- zypp::filesystem::TmpDir::defaultLocation() already contains
+ /var/tmp/ prefix, do not use it it twice (bnc#847794)
+- 3.1.3
+
+-------------------------------------------------------------------
Wed Dec 18 08:27:46 UTC 2013 - [email protected]
- eliminate deprecated zypp::DiskUsage class (bnc#852943)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-pkg-bindings-3.1.2/package/yast2-pkg-bindings.spec
new/yast2-pkg-bindings-3.1.3/package/yast2-pkg-bindings.spec
--- old/yast2-pkg-bindings-3.1.2/package/yast2-pkg-bindings.spec
2013-12-18 09:36:43.000000000 +0100
+++ new/yast2-pkg-bindings-3.1.3/package/yast2-pkg-bindings.spec
2014-01-10 11:11:00.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-pkg-bindings
-Version: 3.1.2
+Version: 3.1.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-3.1.2/src/PkgFunctions.h
new/yast2-pkg-bindings-3.1.3/src/PkgFunctions.h
--- old/yast2-pkg-bindings-3.1.2/src/PkgFunctions.h 2013-12-18
09:36:43.000000000 +0100
+++ new/yast2-pkg-bindings-3.1.3/src/PkgFunctions.h 2014-01-10
11:11:00.000000000 +0100
@@ -131,6 +131,9 @@
// set new target directory
bool SetTarget(const std::string &root);
+ // configured or default download area
+ zypp::Pathname download_area_path();
+
// helper - is the network running?
bool NetworkDetected();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-3.1.2/src/Source_Download.cc
new/yast2-pkg-bindings-3.1.3/src/Source_Download.cc
--- old/yast2-pkg-bindings-3.1.2/src/Source_Download.cc 2013-12-18
09:36:43.000000000 +0100
+++ new/yast2-pkg-bindings-3.1.3/src/Source_Download.cc 2014-01-10
11:11:00.000000000 +0100
@@ -98,8 +98,8 @@
zypp::OnMediaLocation mloc(media_path, mid->value());
mloc.setOptional(optional);
- // create the tmpdir in <_download_area>/var/tmp
- zypp::filesystem::TmpDir tmpdir(_download_area /
zypp::filesystem::TmpDir::defaultLocation());
+ // create the tmpdir in <_download_area>
+ zypp::filesystem::TmpDir tmpdir(download_area_path());
// keep a reference to the tmpdir so the directory is not
deleted at the and of the block
tmp_dirs.push_back(tmpdir);
@@ -344,10 +344,10 @@
zypp::Fetcher f;
f.reset();
zypp::OnMediaLocation mloc(d->value(), mid->value());
- // create the tmpdir in <_root>/var/tmp
- zypp::filesystem::TmpDir tmpdir(_download_area /
zypp::filesystem::TmpDir::defaultLocation() );
+ // create the tmpdir in <_download_area>
+ zypp::filesystem::TmpDir tmpdir(download_area_path());
- // keep the reference to the tmpdir so the directory is not
deleted at the and of the block
+ // keep the reference to the tmpdir so the directory is not
deleted at the and of the block
tmp_dirs.push_back(tmpdir);
path = tmpdir.path();
f.setOptions(zypp::Fetcher::AutoAddIndexes);
@@ -467,3 +467,9 @@
// force refresh
return SourceRefreshHelper(id, true);
}
+
+zypp::Pathname PkgFunctions::download_area_path()
+{
+ // create the tmpdir in the default location if _download_area is empty
+ return _download_area.empty() ?
zypp::filesystem::TmpDir::defaultLocation() : _download_area;
+}
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]