Imported Upstream version 16.4.0

[platform/upstream/libzypp.git] / zypp / target / TargetImpl.h

diff --git a/zypp/target/TargetImpl.h b/zypp/target/TargetImpl.h
index 371b8a4..6658900 100644 (file)
--- a/zypp/target/TargetImpl.h
+++ b/zypp/target/TargetImpl.h
@@ -27,8 +27,9 @@
 #include "zypp/target/rpm/RpmDb.h"
 #include "zypp/target/TargetException.h"
 #include "zypp/target/RequestedLocalesFile.h"
-#include "zypp/target/SoftLocksFile.h"
+#include "zypp/target/SolvIdentFile.h"
 #include "zypp/target/HardLocksFile.h"
+#include "zypp/ManagedFile.h"
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp
@@ -66,9 +67,6 @@ namespace zypp
       /** Dtor. */
       virtual ~TargetImpl();
 
-      /** Null implementation */
-      static TargetImpl_Ptr nullimpl();
-
       /**
        * generates the unique anonymous id which is called
        * when creating the target
@@ -106,7 +104,7 @@ namespace zypp
       void unload();
 
       void reload();
-      
+
       void clearCache();
 
       bool buildCache();
@@ -131,6 +129,9 @@ namespace zypp
       /** Install a source package on the Target. */
       void installSrcPackage( const SrcPackage_constPtr & srcPackage_r );
 
+      /** Provides a source package on the Target. */
+      ManagedFile provideSrcPackage( const SrcPackage_constPtr & srcPackage_r );
+
       /** Overload to realize stream output. */
       virtual std::ostream & dumpOn( std::ostream & str ) const
       {
@@ -161,6 +162,9 @@ namespace zypp
       /** \overload */
       static LocaleSet requestedLocales( const Pathname & root_r );
 
+      /** \copydoc Target::updateAutoInstalled */
+      void updateAutoInstalled();
+
       /** \copydoc Target::targetDistribution() */
       std::string targetDistribution() const;
       /** \overload */
@@ -171,7 +175,12 @@ namespace zypp
       /** \overload */
       static std::string targetDistributionRelease( const Pathname & root_r );
 
-      /** \copydoc Target::distributionVersion()*/
+      /** \copydoc Target::targetDistributionFlavor()*/
+      std::string targetDistributionFlavor() const;
+      /** \overload */
+      static std::string targetDistributionFlavor( const Pathname & root_r );
+
+      /** \copydoc Target::distributionLabel()*/
       Target::DistributionLabel distributionLabel() const;
       /** \overload */
       static Target::DistributionLabel distributionLabel( const Pathname & root_r );
@@ -197,6 +206,8 @@ namespace zypp
                   CommitPackageCache & packageCache_r,
                   ZYppCommitResult & result_r );
 
+      /** Commit helper checking for file conflicts after download. */
+      void commitFindFileConflicts( const ZYppCommitPolicy & policy_r, ZYppCommitResult & result_r );
     protected:
       /** Path to the target */
       Pathname _root;
@@ -204,16 +215,12 @@ namespace zypp
       rpm::RpmDb _rpm;
       /** Requested Locales database */
       RequestedLocalesFile _requestedLocalesFile;
-      /** Soft-locks database */
-      SoftLocksFile _softLocksFile;
+      /** user/auto installed database */
+      SolvIdentFile _autoInstalledFile;
       /** Hard-Locks database */
       HardLocksFile _hardLocksFile;
       /** Cache distributionVersion */
       mutable std::string _distributionVersion;
-
-    private:
-      /** Null implementation */
-      static TargetImpl_Ptr _nullimpl;
     };
     ///////////////////////////////////////////////////////////////////