Mailinglist Archive: zypp-commit (325 mails)

< Previous Next >
[zypp-commit] r7124 - /trunk/libzypp/zypp/target/store/XMLFilesBackend.cc
  • From: mlandres@xxxxxxxxxxxxxxxx
  • Date: Thu, 06 Sep 2007 12:21:06 -0000
  • Message-id: <20070906122106.D499A24FC9@xxxxxxxxxxxxxxxx>
Author: mlandres
Date: Thu Sep  6 14:21:06 2007
New Revision: 7124

URL: http://svn.opensuse.org/viewcvs/zypp?rev=7124&view=rev
Log:
- Work arround installed patterns providing an empty vendor string. (#307743)

Modified:
    trunk/libzypp/zypp/target/store/XMLFilesBackend.cc

Modified: trunk/libzypp/zypp/target/store/XMLFilesBackend.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/store/XMLFilesBackend.cc?rev=7124&r1=7123&r2=7124&view=diff
==============================================================================
--- trunk/libzypp/zypp/target/store/XMLFilesBackend.cc (original)
+++ trunk/libzypp/zypp/target/store/XMLFilesBackend.cc Thu Sep  6 14:21:06 2007
@@ -791,6 +791,7 @@
     impl->_install_notify = parsed.install_notify;
     impl->_delete_notify = parsed.delete_notify;
     impl->_license_to_confirm = parsed.license_to_confirm;
+    impl->_vendor = parsed.vendor;
     impl->_size = parsed.size;
     impl->_downloadSize = parsed.downloadSize;
     impl->_install_only = parsed.install_only;
@@ -883,6 +884,7 @@
     impl->_install_notify = parsed.install_notify;
     impl->_delete_notify = parsed.delete_notify;
     impl->_license_to_confirm = parsed.license_to_confirm;
+    impl->_vendor = parsed.vendor;
     impl->_size = parsed.size;
     impl->_downloadSize = parsed.downloadSize;
     impl->_install_only = parsed.install_only;
@@ -920,6 +922,7 @@
     impl->_install_notify = parsed.install_notify;
     impl->_delete_notify = parsed.delete_notify;
     impl->_license_to_confirm = parsed.license_to_confirm;
+    impl->_vendor = parsed.vendor;
     impl->_size = parsed.size;
     impl->_downloadSize = parsed.downloadSize;
     impl->_install_only = parsed.install_only;
@@ -961,6 +964,7 @@
     impl->_install_notify = parsed.install_notify;
     impl->_delete_notify = parsed.delete_notify;
     impl->_license_to_confirm = parsed.license_to_confirm;
+    impl->_vendor = parsed.vendor;
     impl->_size = parsed.size;
     impl->_downloadSize = parsed.downloadSize;
     impl->_install_only = parsed.install_only;
@@ -1020,6 +1024,7 @@
     impl->_install_notify = parsed.install_notify;
     impl->_delete_notify = parsed.delete_notify;
     impl->_license_to_confirm = parsed.license_to_confirm;
+    impl->_vendor = parsed.vendor;
     impl->_size = parsed.size;
     impl->_downloadSize = parsed.downloadSize;
     impl->_install_only = parsed.install_only;
@@ -1173,6 +1178,7 @@
     impl->_install_notify = parsed.install_notify;
     impl->_delete_notify = parsed.delete_notify;
     impl->_license_to_confirm = parsed.license_to_confirm;
+    impl->_vendor = parsed.vendor;
     impl->_size = parsed.size;
     impl->_downloadSize = parsed.downloadSize;
     impl->_install_only = parsed.install_only;
@@ -1189,6 +1195,13 @@
     if (!parsed.arch.empty())
       arch = Arch(parsed.arch);
 
+    // Workaround for bug #307743:
+    // Hijack installed patterns with empty vendor.
+    if ( impl->_vendor.empty() )
+    {
+      impl->_vendor = "SUSE (assumed)";
+    }
+
     // Collect basic Resolvable data
     NVRAD dataCollect( parsed.name, Edition( parsed.ver, parsed.rel, parsed.epoch ), arch, createDependencies( parsed, ResTraits<Pattern>::kind));
     Pattern::Ptr pattern = detail::makeResolvableFromImpl( dataCollect, impl );
@@ -1217,6 +1230,7 @@
     impl->_install_notify = parsed.install_notify;
     impl->_delete_notify = parsed.delete_notify;
     impl->_license_to_confirm = parsed.license_to_confirm;
+    impl->_vendor = parsed.vendor;
     impl->_size = parsed.size;
     impl->_downloadSize = parsed.downloadSize;
     impl->_install_only = parsed.install_only;

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages