Attachment 157909 Details for Bug 298716

Proposed fix to parser/susetags/RepoParser.cc

bug298716.patch (text/x-patch), 1.80 KB, created by Klaus Kämpf on 2007-08-16 12:51:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Kämpf

Created: 2007-08-16 12:51:09 UTC

Size: 1.80 KB

patch

obsolete

>Index: parser/susetags/RepoParser.cc
>===================================================================
>--- parser/susetags/RepoParser.cc	(revision 6702)
>+++ parser/susetags/RepoParser.cc	(working copy)
>@@ -486,6 +486,40 @@
>         {
>           if ( isPatternFile( it->first ) )
>           {
>+            // omit unwanted patterns, see https://bugzilla.novell.com/show_bug.cgi?id=298716
>+            // expect "<name>.<arch>.pat[.gz]", <name> might contain additional dots
>+            // split at dots, take .pat or .pat.gz into account
>+
>+            // vector of splitted pattern filename elements
>+            std::vector<std::string> patparts;
>+
>+            // this is the offset from the last element of patparts
>+            unsigned archoff = 2;
>+
>+            unsigned count = str::split( it->first, std::back_inserter( patparts ), "." );
>+
>+            if ( patparts[count-1] == "gz" )
>+              archoff++;
>+
>+            if ( count > archoff )
>+            {
>+              try				// might by an invalid architecture
>+              {
>+                Arch patarch( patparts[count-archoff] );
>+                if ( !patarch.compatibleWith( ZConfig::instance().systemArchitecture() ) )
>+                {
>+                  // discard, if not compatible
>+                  MIL << "Discarding pattern " << it->first << endl;
>+                  continue;
>+                }
>+              }
>+              catch ( const Exception & excpt )
>+              {
>+                WAR << "Pattern file name does not contain recognizable architecture: " << it->first << endl;
>+                // keep .pat file if it doesn't contain an recognizable arch
>+              }
>+            }
>+
> 	    Pathname inputfile( getOptionalFile( _descrdir / it->first, false /*filename already contains .gz */ ) );
> 	    if ( ! inputfile.empty() )
> 	    {

Actions: View

Attachments on bug 298716: 157909 | 157911