- some minor adaptions for newer zypp

diff --git a/swig/Kind.i b/swig/Kind.i
index a6bc3ee..140c844 100644 (file)
--- a/swig/Kind.i
+++ b/swig/Kind.i
@@ -45,7 +45,7 @@
     }
 }
 
-// this is just a workaround since the whole code above does not work
+// FIXME: this is just a workaround since the whole code above does not work
 %extend Resolvable {
     const char* kindToS()
     {

diff --git a/swig/Package.i b/swig/Package.i
index 8573772..9bde80e 100644 (file)
--- a/swig/Package.i
+++ b/swig/Package.i
@@ -1,6 +1,6 @@
 
-  class Package : public ResObject
-  {
+class Package : public ResObject
+{
 
   public:
     typedef detail::PackageImplIf    Impl;
@@ -10,10 +10,7 @@
     typedef TraitsType::constPtrType constPtr;
 
   public:
-    /**
-     * Checksum the source says this package should have
-     */
-    CheckSum checksum() const;
+
     /** Get the package change log */
     Changelog changelog() const;
     /** */
@@ -50,10 +47,11 @@
     //DiskUsage diskusage() const;
 
     /** location in source */
-    Pathname location() const;
+    OnMediaLocation location() const;
 
   protected:
     Package( const NVRAD & nvrad_r );
     /** Dtor */
     virtual ~Package();
-  };
\ No newline at end of file
+};
+

diff --git a/swig/Repository.i b/swig/Repository.i
index 32e0a2c..27d12ef 100644 (file)
--- a/swig/Repository.i
+++ b/swig/Repository.i
@@ -1,7 +1,7 @@
-  
-  class Repository : private base::SafeBool<Repository>
-  {
-    public:
+
+class Repository : private base::SafeBool<Repository>
+{
+  public:
     Repository();
     static const Repository noRepository;
   public:
@@ -11,5 +11,5 @@
     const RepoInfo info() const;
     const std::list<packagedelta::PatchRpm> & patchRpms() const;
     const std::list<packagedelta::DeltaRpm> & deltaRpms() const;
-  };
+};
 

diff --git a/swig/ResObject.i b/swig/ResObject.i
index 3ae771d..08230e6 100644 (file)
--- a/swig/ResObject.i
+++ b/swig/ResObject.i
@@ -1,8 +1,8 @@
 
-%template(ResObject_Ptr) intrusive_ptr<ResObject>;
+// %template(ResObject_Ptr) intrusive_ptr<ResObject>;
 
 class ResObject : public Resolvable
-  {
+{
   public:
     typedef detail::ResObjectImplIf  Impl;
     typedef ResObject                Self;
@@ -18,7 +18,7 @@ class ResObject : public Resolvable
     Text licenseToConfirm() const;
     Vendor vendor() const;
     ByteCount size() const;
-    ByteCount archivesize() const;
+    ByteCount downloadSize() const;
     Repository repository() const;
     unsigned mediaNr() const;
     bool installOnly() const;
@@ -29,4 +29,4 @@ class ResObject : public Resolvable
                const NVRAD & nvrad_r );
     virtual ~ResObject();
     virtual std::ostream & dumpOn( std::ostream & str ) const;
-  };
+};

diff --git a/swig/Resolvable.i b/swig/Resolvable.i
index 892e782..05bc82e 100644 (file)
--- a/swig/Resolvable.i
+++ b/swig/Resolvable.i
@@ -1,13 +1,13 @@
 
- class Resolvable
- {
+class Resolvable
+{
   public:
     typedef Resolvable               Self;
     typedef ResTraits<Self>          TraitsType;
     typedef TraitsType::KindType     Kind;
     typedef TraitsType::PtrType      Ptr;
     typedef TraitsType::constPtrType constPtr;
-    
+
     const Kind & kind() const;
     const std::string & name() const;
     const Edition & edition() const;
@@ -17,11 +17,11 @@
     //const Dependencies & deps() const;
     //void injectProvides( const Capability & cap_r );
     //void injectRequires( const Capability & cap_r );
-    
+
   protected:
     Resolvable( const Kind & kind_r,
                 const NVRAD & nvrad_r );
     virtual ~Resolvable();
     virtual std::ostream & dumpOn( std::ostream & str ) const;
-  };
+};
 

diff --git a/swig/Target.i b/swig/Target.i
index b831e51..dfa66eb 100644 (file)
--- a/swig/Target.i
+++ b/swig/Target.i
@@ -2,25 +2,25 @@
 typedef intrusive_ptr<Target> Target_Ptr;
 
 class Target
-  {
+{
   public:
-    
+
     typedef std::list<PoolItem_Ref> PoolItemList;
 
   public:
 
     /** All resolvables provided by the target. */
     const ResStore & resolvables();
-    
-    /** 
+
+    /**
      * reload the target in future calls if
      * needed.
      * note the loading can actually be delayed, but
-     * the next call to resolvables must reflect the 
+     * the next call to resolvables must reflect the
      * status of the system.
     */
     void reset();
-    
+
     /**
      * load resolvables of certain kind in the internal store
      * and return a iterator
@@ -41,15 +41,6 @@ class Target
 
     ResObject::constPtr whoOwnsFile (const std::string & path_str) const;
 
-    /** JUST FOR TESTSUITE */
-    /** Sort according to prereqs and media numbers
-     * \todo provide it as standalone algorithm
-    */
-    void getResolvablesToInsDel ( const ResPool pool_r,
-                                  PoolItemList & dellist_r,
-                                  PoolItemList & instlist_r,
-                                  PoolItemList & srclist_r ) const;
-
 #ifndef STORAGE_DISABLED
     /** enables the storage target */
     bool isStorageEnabled() const;
@@ -64,6 +55,6 @@ class Target
 
     /** return the last modification date of the target */
     Date timestamp() const;
-  };
-  
-%template(Target_Ptr) intrusive_ptr<Target>;
\ No newline at end of file
+};
+
+%template(Target_Ptr) intrusive_ptr<Target>;