commit zypper

2 Sep 2008

Hello community,

here is the log from the commit of package zypper
checked in at Tue Sep 2 12:17:53 CEST 2008.


--------

--- zypper/zypper.changes	2008-08-12 20:46:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/zypper/zypper.changes	2008-09-02 11:46:07.407310000 +0200
@@ -1,0 +2,13 @@
+Tue Aug 19 16:39:32 CEST 2008 - dmacvicar@suse.de
+
+- confirm unsupported packages in SLE 
+  (fate#305057) 
+
+-------------------------------------------------------------------
+Mon Aug 18 17:50:02 CEST 2008 - dmacvicar@suse.de
+
+- warn if repostory seems to be outdated
+  (fate#301904)
+- 0.12.2
+
+-------------------------------------------------------------------



Old:
----
  zypper-0.12.1.tar.bz2

New:
----
  zypper-0.12.2.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ zypper.spec ++++++
--- /var/tmp/diff_new_pack.N24946/_old	2008-09-02 12:17:21.000000000 +0200
+++ /var/tmp/diff_new_pack.N24946/_new	2008-09-02 12:17:21.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package zypper (Version 0.12.1)
+# spec file for package zypper (Version 0.12.2)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,7 +19,7 @@
 
 
 Name:           zypper
-BuildRequires:  boost-devel >= 1.33.1 gettext-devel >= 0.15 libzypp-devel >= 5.4.0 readline-devel >= 5.1
+BuildRequires:  boost-devel >= 1.33.1 gettext-devel >= 0.15 libzypp-devel >= 5.7.0 readline-devel >= 5.1
 BuildRequires:  cmake >= 2.4.6 gcc-c++ >= 4.1
 Requires:       procps
 Recommends:     logrotate cron 
@@ -29,9 +29,9 @@
 AutoReqProv:    on
 PreReq:         permissions
 Summary:        Command Line Package Management Using Libzypp
-Version:        0.12.1
+Version:        0.12.2
 Release:        1
-Source:         zypper-0.12.1.tar.bz2
+Source:         zypper-0.12.2.tar.bz2
 Prefix:         /usr
 Url:            http://en.opensuse.org/Zypper
 Provides:       y2pmsh 
@@ -55,6 +55,9 @@
 mkdir build
 cd build
 cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \
+%if 0%{?sles_version}
+       -DZYPPER_CONFIRM_UNSUPPORTED_PACKAGES \
+%endif
       -DSYSCONFDIR=%{_sysconfdir} \
       -DMANDIR=%{_mandir} \
       -DCMAKE_VERBOSE_MAKEFILE=TRUE \
@@ -110,6 +113,13 @@
 # it from being erased by rpm -e
 %ghost %config(noreplace) %{_var}/log/zypper.log
 %changelog
+* Tue Aug 19 2008 dmacvicar@suse.de
+- confirm unsupported packages in SLE
+  (fate#305057)
+* Mon Aug 18 2008 dmacvicar@suse.de
+- warn if repostory seems to be outdated
+  (fate#301904)
+- 0.12.2
 * Sat Aug 02 2008 jkupec@suse.cz
 - service handling improved, ls, rs, refs now allow to specify
   services by #, alias, or URI as in repos

++++++ zypper-0.12.1.tar.bz2 -> zypper-0.12.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.12.1/CMakeLists.txt new/zypper-0.12.2/CMakeLists.txt
--- old/zypper-0.12.1/CMakeLists.txt	2008-08-12 20:07:03.000000000 +0200
+++ new/zypper-0.12.2/CMakeLists.txt	2008-09-02 11:36:46.000000000 +0200
@@ -41,6 +41,11 @@
   MESSAGE( FATAL_ERROR "readline not found" )
 ENDIF( READLINE_FOUND )
 
+IF( ZYPPER_CONFIRM_UNSUPPORTED_PACKAGES )
+  ADD_DEFINITIONS( -DZYPPER_CONFIRM_UNSUPPORTED_PACKAGES )
+ENDIF( ZYPPER_CONFIRM_UNSUPPORTED_PACKAGES )
+
+
 ADD_SUBDIRECTORY( src )
 ADD_SUBDIRECTORY( po )
 ADD_SUBDIRECTORY( doc )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.12.1/package/zypper.changes new/zypper-0.12.2/package/zypper.changes
--- old/zypper-0.12.1/package/zypper.changes	2008-08-12 20:07:05.000000000 +0200
+++ new/zypper-0.12.2/package/zypper.changes	2008-09-02 11:36:46.000000000 +0200
@@ -1,4 +1,17 @@
 -------------------------------------------------------------------
+Tue Aug 19 16:39:32 CEST 2008 - dmacvicar@suse.de
+
+- confirm unsupported packages in SLE 
+  (fate#305057) 
+
+-------------------------------------------------------------------
+Mon Aug 18 17:50:02 CEST 2008 - dmacvicar@suse.de
+
+- warn if repostory seems to be outdated
+  (fate#301904)
+- 0.12.2
+
+-------------------------------------------------------------------
 Sat Aug  2 19:40:37 CEST 2008 - jkupec@suse.cz
 
 - service handling improved, ls, rs, refs now allow to specify
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.12.1/src/repos.cc new/zypper-0.12.2/src/repos.cc
--- old/zypper-0.12.1/src/repos.cc	2008-08-12 20:07:04.000000000 +0200
+++ new/zypper-0.12.2/src/repos.cc	2008-09-02 11:36:46.000000000 +0200
@@ -2393,6 +2393,23 @@
       }
 
       manager.loadFromCache(repo);
+
+      
+
+      // check that the metadata is not outdated
+      // feature #301904
+      Repository robj = God->pool().reposFind(repo.alias());
+      if ( robj != Repository::noRepository &&
+           robj.maybeOutdated() )
+      {
+        
+       zypper.out().warning(boost::str(format(
+              _("Repository '%s' appears to outdated. Consider using a different mirror or server."))
+              % repo.name()), Out::QUIET);
+          WAR << format("Repository '%s' seems to be outdated")
+              % repo.name() << endl;
+
+      }
     }
     catch (const Exception & e)
     {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.12.1/src/solve-commit.cc new/zypper-0.12.2/src/solve-commit.cc
--- old/zypper-0.12.1/src/solve-commit.cc	2008-08-12 20:07:04.000000000 +0200
+++ new/zypper-0.12.2/src/solve-commit.cc	2008-09-02 11:36:46.000000000 +0200
@@ -271,7 +271,8 @@
   TO_REINSTALL,
   TO_REMOVE,
   TO_CHANGE_ARCH,
-  TO_CHANGE_VENDOR
+  TO_CHANGE_VENDOR,
+  UNSUPPORTED
 } SummaryType;
 
 static void xml_print_to_transact_tag(SummaryType stype, bool end = false)
@@ -299,6 +300,9 @@
   case TO_CHANGE_VENDOR:
     cout << "<" << (end ? "/" : "") << "to-change-vendor>" << endl;
     break;
+  case UNSUPPORTED:
+    cout << "<" << (end ? "/" : "") << "unsupported>" << endl;
+    break;
   }
 }
 
@@ -510,6 +514,14 @@
           "The following products are going to change vendor:",
           it->second.size());
       break;
+    case UNSUPPORTED:
+      // we only look vendor support in packages
+      if (it->first == ResKind::package)
+        title = _PL(
+          "The following package is not supported by its vendor:",
+          "The following packages are not supported by their vendor:",
+          it->second.size());
+      break;
     }
 
     show_summary_resolvable_list(title, it, zypper.out());
@@ -605,7 +617,10 @@
   KindToResObjectSet toremove;
   KindToResObjectSet tochangearch;
   KindToResObjectSet tochangevendor;
-
+  // objects from previous lists that
+  // are not supported
+  KindToResObjectSet tounsupported;
+  
   // iterate the to_be_installed to find installs/upgrades/downgrades + size info
   ByteCount download_size, new_installed_size;
 
@@ -617,6 +632,16 @@
     {
       ResObject::constPtr res(*resit);
 
+      // FIXME asKind not working?
+      Package::constPtr pkg = asKind<Package>(res);
+      if ( pkg )
+      {
+          // FIXME refactor with libzypp Package::vendorSupportAvailable()
+          
+          if ( pkg->maybeUnsupported() ) 
+              tounsupported[res->kind()].insert(res);
+      }
+
       // find in to_be_removed:
       bool upgrade_downgrade = false;
       for (set<ResObject::constPtr>::iterator rmit = to_be_removed[res->kind()].begin();
@@ -716,7 +741,9 @@
   show_summary_of_type(zypper, TO_REMOVE, toremove);
   show_summary_of_type(zypper, TO_CHANGE_ARCH, tochangearch);
   show_summary_of_type(zypper, TO_CHANGE_VENDOR, tochangevendor);
-
+#ifdef ZYPPER_CONFIRM_UNSUPPORTED_PACKAGES
+  show_summary_of_type(zypper, UNSUPPORTED, tounsupported);
+#endif
   // "</install-summary>"
   if (zypper.out().type() == Out::TYPE_XML)
     cout << "</install-summary>" << endl;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.12.1/VERSION.cmake new/zypper-0.12.2/VERSION.cmake
--- old/zypper-0.12.1/VERSION.cmake	2008-08-12 20:07:05.000000000 +0200
+++ new/zypper-0.12.2/VERSION.cmake	2008-09-02 11:36:46.000000000 +0200
@@ -20,4 +20,4 @@
 
 SET(VERSION_MAJOR "0")
 SET(VERSION_MINOR "12")
-SET(VERSION_PATCH "1")
+SET(VERSION_PATCH "2")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.12.1/zypper.spec.cmake new/zypper-0.12.2/zypper.spec.cmake
--- old/zypper-0.12.1/zypper.spec.cmake	2008-08-12 20:07:05.000000000 +0200
+++ new/zypper-0.12.2/zypper.spec.cmake	2008-09-02 11:36:46.000000000 +0200
@@ -11,7 +11,7 @@
 # norootforbuild
 
 Name:           @PACKAGE@
-BuildRequires:  libzypp-devel >= 5.4.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1
+BuildRequires:  libzypp-devel >= 5.7.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1
 BuildRequires:  gcc-c++ >= 4.1 cmake >= 2.4.6
 Requires:	procps
 Recommends:     logrotate cron 
@@ -46,6 +46,9 @@
 mkdir build
 cd build
 cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \
+%if 0%{?sles_version}
+       -DZYPPER_CONFIRM_UNSUPPORTED_PACKAGES \
+%endif
       -DSYSCONFDIR=%{_sysconfdir} \
       -DMANDIR=%{_mandir} \
       -DCMAKE_VERBOSE_MAKEFILE=TRUE \


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit zypper

root＠Hilbert.suse.de