Merge pull request #95 from yast/transact_by

Added "transact_by" key to the PkgPropertiesAll call
yast · Jan 31, 2018 · 3d39642 · 3d39642
2 parents 9eb32f4 + f088167
commit 3d39642
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 3 deletions.
diff --git a/package/yast2-pkg-bindings-devel-doc.spec b/package/yast2-pkg-bindings-devel-doc.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-pkg-bindings-devel-doc
-Version:        4.0.6
+Version:        4.0.7
 Release:        0
 License:        GPL-2.0
 Group:          Documentation/HTML

diff --git a/package/yast2-pkg-bindings.changes b/package/yast2-pkg-bindings.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 31 12:51:57 UTC 2018 - lslezak@suse.cz
+
+- Added "transact_by" key to the PkgPropertiesAll call
+  (improvement for bsc#1077882)
+- 4.0.7
+
 -------------------------------------------------------------------
 Wed Jan 24 11:52:55 UTC 2018 - lslezak@suse.cz
 

diff --git a/package/yast2-pkg-bindings.spec b/package/yast2-pkg-bindings.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-pkg-bindings
-Version:        4.0.6
+Version:        4.0.7
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/Package.cc b/src/Package.cc
@@ -921,6 +921,7 @@ PkgFunctions::PkgProp(const zypp::PoolItem &item)
     data->add( YCPString("status"), YCPSymbol(status));
 
     data->add(YCPString("on_system_by_user"), YCPBoolean(item.satSolvable().onSystemByUser()));
+    data->add(YCPString("transact_by"), YCPSymbol(TransactToString(item.status().getTransactByValue())));
 
     data->add( YCPString("location"), YCPString( pkg->location().filename().basename() ) );
     data->add( YCPString("path"), YCPString( pkg->location().filename().asString() ) );

diff --git a/src/PkgFunctions.h b/src/PkgFunctions.h
@@ -279,6 +279,8 @@ class PkgFunctions
       void AddAuthData(zypp::Url url);
       // helper with common code to SourceURL and SourceRawUrl
       YCPValue GetSourceUrl(const YCPInteger& id, bool raw);
+      // helper - convert transaction_by to string
+      std::string TransactToString(zypp::ResStatus::TransactByValue trans);
 
     public:
 	// general

diff --git a/src/Resolvable_Properties.cc b/src/Resolvable_Properties.cc
@@ -187,7 +187,7 @@ PkgFunctions::ResolvableDependencies(const YCPString& name, const YCPSymbol& kin
     return ResolvablePropertiesEx (name, kind_r, version, true);
 }
 
-std::string TransactToString(zypp::ResStatus::TransactByValue trans)
+std::string PkgFunctions::TransactToString(zypp::ResStatus::TransactByValue trans)
 {
     std::string ret;