Mailinglist Archive: zypp-commit (325 mails)

< Previous Next >
[zypp-commit] r7256 - in /trunk/libzypp: package/libzypp.changes zypp/parser/susetags/PackagesDuFileReader.cc zypp/zypp_detail/ZYppImpl.cc
  • From: lslezak@xxxxxxxxxxxxxxxx
  • Date: Mon, 17 Sep 2007 10:38:26 -0000
  • Message-id: <20070917103826.6905A174B4@xxxxxxxxxxxxxxxx>
Author: lslezak
Date: Mon Sep 17 12:38:25 2007
New Revision: 7256

URL: http://svn.opensuse.org/viewcvs/zypp?rev=7256&view=rev
Log:
- fixed DU parsing in inst-sys (#308659)
- revision 7256

Modified:
    trunk/libzypp/package/libzypp.changes
    trunk/libzypp/zypp/parser/susetags/PackagesDuFileReader.cc
    trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc

Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=7256&r1=7255&r2=7256&view=diff
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Mon Sep 17 12:38:25 2007
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Sep 17 12:36:28 CEST 2007 - lslezak@xxxxxxx
+
+- fixed DU parsing in inst-sys (#308659)
+- revision 7256
+
+-------------------------------------------------------------------
 Fri Sep 14 22:57:54 CEST 2007 - ma@xxxxxxx
 
 - Enable using patch and delta rpms. (#309124)

Modified: trunk/libzypp/zypp/parser/susetags/PackagesDuFileReader.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/susetags/PackagesDuFileReader.cc?rev=7256&r1=7255&r2=7256&view=diff
==============================================================================
--- trunk/libzypp/zypp/parser/susetags/PackagesDuFileReader.cc (original)
+++ trunk/libzypp/zypp/parser/susetags/PackagesDuFileReader.cc Mon Sep 17 12:38:25 2007
@@ -10,6 +10,7 @@
  *
 */
 #include <iostream>
+#include <cstdlib>
 #include "zypp/base/Easy.h"
 #include "zypp/base/Regex.h"
 #include "zypp/base/Logger.h"
@@ -133,7 +134,8 @@
                                         str::strtonum<unsigned>(what[2]) + str::strtonum<unsigned>(what[3]),
                                         str::strtonum<unsigned>(what[4]) + str::strtonum<unsigned>(what[5]) );
 
-                if ( _mounts.empty() )
+               // the partitioning is not known or we are running in instsys (see #308659)
+                if ( _mounts.empty() || (getenv("YAST_IS_RUNNING") && (std::string(getenv("YAST_IS_RUNNING")) == "instsys" )))
                 {
                   // if no mount information, cut off deeper directory
                   // levels in DiskUsage::Entry to reduce data size.

Modified: trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc?rev=7256&r1=7255&r2=7256&view=diff
==============================================================================
--- trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc (original)
+++ trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc Mon Sep 17 12:38:25 2007
@@ -198,7 +198,7 @@
       if (_disk_usage)
         return _disk_usage->getMountPoints();
       else
-        return DiskUsageCounter::MountPointSet();
+        return DiskUsageCounter::detectMountPoints();
     }
 
     //------------------------------------------------------------------------

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

< Previous Next >
This Thread
  • No further messages