added mediaNr() to PatchRpm and DeltaRpm classes

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 945dd49..52e4523 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Tue May 23 17:04:04 CEST 2006 - jsrain@suse.cz
+
+- added mediaNr() to PatchRpm and DeltaRpm classes
+- rev 3430
+
+-------------------------------------------------------------------
 Tue May 23 15:58:04 CEST 2006 - dmacvicar@suse.de
 
 - enable YUM license to confirm.

diff --git a/zypp/DeltaRpm.h b/zypp/DeltaRpm.h
index 8e8e3db..69db065 100644 (file)
--- a/zypp/DeltaRpm.h
+++ b/zypp/DeltaRpm.h
@@ -29,13 +29,15 @@ namespace zypp
         const ByteCount & downloadsize,
         const CheckSum & checksum,
         const Date & buildtime,
-        const BaseVersion & base_version)
+        const BaseVersion & base_version,
+        const unsigned media_nr)
     : _arch(arch)
     , _filename(filename)
     , _downloadsize(downloadsize)
     , _checksum(checksum)
     , _buildtime(buildtime)
     , _base_version(base_version)
+    , _media_nr(media_nr)
     {}
     Arch arch() const { return _arch; }
     Pathname filename() const { return _filename; }
@@ -43,6 +45,7 @@ namespace zypp
     CheckSum checksum() const { return _checksum; }
     Date buildtime() const { return _buildtime; }
     BaseVersion baseVersion() const { return _base_version; }
+    unsigned mediaNr() const { return _media_nr; }
   private:
     Arch _arch;
     Pathname _filename;
@@ -50,6 +53,7 @@ namespace zypp
     CheckSum _checksum;
     Date _buildtime;
     BaseVersion _base_version;
+    unsigned _media_nr;
   };
 
 } // namespace zypp

diff --git a/zypp/PatchRpm.h b/zypp/PatchRpm.h
index e13d754..facedf7 100644 (file)
--- a/zypp/PatchRpm.h
+++ b/zypp/PatchRpm.h
@@ -29,13 +29,15 @@ namespace zypp
              const ByteCount & downloadsize,
              const CheckSum & checksum,
              const Date & buildtime,
-             const std::list<BaseVersion> & base_versions)
+             const std::list<BaseVersion> & base_versions,
+            const unsigned media_nr)
     : _arch(arch)
     , _filename(filename)
     , _downloadsize(downloadsize)
     , _checksum(checksum)
     , _buildtime(buildtime)
     , _base_versions(base_versions)
+    , _media_nr(media_nr)
     {}
     Arch arch() const { return _arch; }
     Pathname filename() const { return _filename; }
@@ -43,6 +45,7 @@ namespace zypp
     CheckSum checksum() const { return _checksum; }
     Date buildtime() const { return _buildtime; }
     std::list<BaseVersion> baseVersions() const { return _base_versions; }
+    unsigned mediaNr() const { return _media_nr; }
   private:
     Arch _arch;
     Pathname _filename;
@@ -50,6 +53,7 @@ namespace zypp
     CheckSum _checksum;
     Date _buildtime;
     std::list<BaseVersion> _base_versions;
+    unsigned _media_nr;
   };
 
 

diff --git a/zypp/parser/yum/YUMPatchParser.cc b/zypp/parser/yum/YUMPatchParser.cc
index c0ec02a..0dbe82a 100644 (file)
--- a/zypp/parser/yum/YUMPatchParser.cc
+++ b/zypp/parser/yum/YUMPatchParser.cc
@@ -319,6 +319,7 @@ XXX << "parseAtomsNode(" << name << ")" << endl;
        patchRpm.downloadsize = _helper.attribute( formatNode, "downloadsize" );
        patchRpm.md5sum = _helper.attribute( formatNode, "md5sum" );
        patchRpm.buildtime = _helper.attribute( formatNode, "buildtime" );
+       patchRpm.media = "1";
        for (xmlNodePtr child = formatNode->children; 
             child != 0;
             child = child ->next) {
@@ -368,6 +369,7 @@ XXX << "parseAtomsNode(" << name << ")" << endl;
        deltaRpm.downloadsize = _helper.attribute( formatNode, "downloadsize" );
        deltaRpm.md5sum = _helper.attribute( formatNode, "md5sum" );
        deltaRpm.buildtime = _helper.attribute( formatNode, "buildtime" );
+       deltaRpm.media = "1";
        for (xmlNodePtr child = formatNode->children; 
             child != 0;
             child = child ->next) {

diff --git a/zypp/source/yum/YUMPackageImpl.cc b/zypp/source/yum/YUMPackageImpl.cc
index 88eb030..11e0ab5 100644 (file)
--- a/zypp/source/yum/YUMPackageImpl.cc
+++ b/zypp/source/yum/YUMPackageImpl.cc
@@ -153,7 +153,8 @@ namespace zypp
                         strtol(it->downloadsize.c_str(), 0, 10),
                         CheckSum("md5", it->md5sum),
                         strtol(it->buildtime.c_str(), 0, 10),
-                        base_versions
+                        base_versions,
+                        strtol(it->media.c_str(), 0, 10)
          );
          _patch_rpms.push_back(patch);
 
@@ -175,7 +176,8 @@ namespace zypp
                         strtol(it->downloadsize.c_str(), 0, 10),
                         CheckSum("md5", it->md5sum),
                         strtol(it->buildtime.c_str(), 0, 10),
-                        base_version
+                        base_version,
+                        strtol(it->media.c_str(), 0, 10)
          );
          _delta_rpms.push_back(delta);
        }

diff --git a/zypp/source/yum/YUMSourceImpl.cc b/zypp/source/yum/YUMSourceImpl.cc
index ad509f6..8edbfac 100644 (file)
--- a/zypp/source/yum/YUMSourceImpl.cc
+++ b/zypp/source/yum/YUMSourceImpl.cc
@@ -804,7 +804,8 @@ namespace zypp
              strtol(it->downloadsize.c_str(), 0, 10),
              CheckSum (it->checksumType, it->checksum),
              strtol(it->buildtime.c_str(), 0, 10),
-             bv_list
+             bv_list,
+             strtol(it->media.c_str(), 0, 10)
            );
            impl->_patch_rpms.push_back(patch_rpm);
          }
@@ -825,7 +826,8 @@ namespace zypp
                Edition (it->baseVersion.ver, it->baseVersion.rel, it->baseVersion.epoch),
                 CheckSum("md5", it->baseVersion.md5sum),
                strtol(it->baseVersion.buildtime.c_str(), 0, 10)
-             )
+             ),
+             strtol(it->media.c_str(), 0, 10)
            );
            impl->_delta_rpms.push_back(delta_rpm);
          }