Mailinglist Archive: zypp-commit (325 mails)

< Previous Next >
[zypp-commit] r7212 - /trunk/libzypp/zypp/parser/susetags/RepoParser.cc
  • From: mlandres@xxxxxxxxxxxxxxxx
  • Date: Wed, 12 Sep 2007 15:11:12 -0000
  • Message-id: <20070912151112.9049135EFC@xxxxxxxxxxxxxxxx>
Author: mlandres
Date: Wed Sep 12 17:11:12 2007
New Revision: 7212

URL: http://svn.opensuse.org/viewcvs/zypp?rev=7212&view=rev
Log:
avoid excessive warnings about skipped files in multiarch repos

Modified:
    trunk/libzypp/zypp/parser/susetags/RepoParser.cc

Modified: trunk/libzypp/zypp/parser/susetags/RepoParser.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/susetags/RepoParser.cc?rev=7212&r1=7211&r2=7212&view=diff
==============================================================================
--- trunk/libzypp/zypp/parser/susetags/RepoParser.cc (original)
+++ trunk/libzypp/zypp/parser/susetags/RepoParser.cc Wed Sep 12 17:11:12 2007
@@ -214,19 +214,19 @@
          */
          Pathname assertMandatoryFile( const Pathname & file_r, bool lookgz = true ) const
          {
-      if ( lookgz )
-      {
-        PathInfo gzinputfile( _reporoot / (file_r.extend(".gz")) );
-        if ( !gzinputfile.isFile() )
-        {
-          WAR << _reporoot << ": Skip gz required file (will look for non-gz): " <<  file_r.extend(".gz").asString() << endl;
-        }
-        else
-        {
-          return gzinputfile.path();
-        }
-      }
-           PathInfo inputfile( _reporoot / file_r );
+            if ( lookgz )
+            {
+              PathInfo gzinputfile( _reporoot / (file_r.extend(".gz")) );
+              if ( !gzinputfile.isFile() )
+              {
+                WAR << _reporoot << ": Skip gz required file (will look for non-gz): " <<  file_r.extend(".gz").asString() << endl;
+              }
+              else
+              {
+                return gzinputfile.path();
+              }
+            }
+            PathInfo inputfile( _reporoot / file_r );
            if ( ! inputfile.isFile() )
            {
              ZYPP_THROW( ParseException( _reporoot.asString() + ": " + _("Required file is missing: ") + file_r.asString() ) );
@@ -239,22 +239,22 @@
          */
          Pathname getOptionalFile( const Pathname & file_r, bool lookgz = true  ) const
          {
-      if ( lookgz )
-      {
-        PathInfo gzinputfile( _reporoot / (file_r.extend(".gz")) );
-        if ( !gzinputfile.isFile() )
-        {
-          WAR << _reporoot << ": Skip optional file: " <<  file_r.extend(".gz").asString() << endl;
-        }
-        else
-        {
-          return gzinputfile.path();
-        }
-      }
-           PathInfo inputfile( _reporoot / file_r );
+            if ( lookgz )
+            {
+              PathInfo gzinputfile( _reporoot / (file_r.extend(".gz")) );
+              if ( !gzinputfile.isFile() )
+              {
+                //WAR << _reporoot << ": Skip optional file: " <<  file_r.extend(".gz").asString() << endl;
+              }
+              else
+              {
+                return gzinputfile.path();
+              }
+            }
+            PathInfo inputfile( _reporoot / file_r );
            if ( ! inputfile.isFile() )
            {
-             WAR << _reporoot << ": Skip optional file: " <<  file_r.asString() << endl;
+             //WAR << _reporoot << ": Skip optional file: " <<  file_r.asString() << endl;
              return Pathname();
            }
            return inputfile.path();
@@ -287,19 +287,19 @@
                  return true; // got it
              }
 
-        if ( it->first == (searchFor+".gz") )
-        {
-          // got it
-          PathInfo inputfile( _reporoot / _descrdir / (searchFor+".gz") );
-          if ( ! inputfile.isFile() )
-          {
-            WAR << "Known and desired file is not on disk: " << inputfile << endl;
-          }
-          else
-            return true; // got it
-        }
-      }
-           return false; // not found
+              if ( it->first == (searchFor+".gz") )
+              {
+                // got it
+                PathInfo inputfile( _reporoot / _descrdir / (searchFor+".gz") );
+                if ( ! inputfile.isFile() )
+                {
+                  WAR << "Known and desired file is not on disk: " << inputfile << endl;
+                }
+                else
+                  return true; // got it
+              }
+            }
+            return false; // not found
          }
 
          /** Take care translations for \a locale_r or an appropriate
@@ -361,7 +361,7 @@
            data::RecordId ret = _idMap[key_r];
            if ( ret == data::noRecordId )
            {
-             WAR << "No record id for " << key_r << endl;
+             //WAR << "No record id for " << key_r << endl;
            }
            return ret;
          }

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

< Previous Next >
This Thread
  • No further messages