Don't like ads? PRO users don't see any ads ;-)
Public Pastes
Guest

Untitled

By: a guest on May 5th, 2012  |  syntax: None  |  size: 1.44 KB  |  hits: 12  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py
  2. index a708b0a..eb3a89a 100644
  3. --- a/src/lib/Server/Plugins/Metadata.py
  4. +++ b/src/lib/Server/Plugins/Metadata.py
  5. @@ -544,15 +544,19 @@ class Metadata(Bcfg2.Server.Plugin.Plugin,
  6.                  self.logger.error("Address %s has multiple reverse assignments; a uuid must be used" % (address))
  7.                  raise MetadataConsistencyError
  8.              return self.addresses[address][0]
  9. -        try:
  10. -            cname = socket.gethostbyaddr(address)[0].lower()
  11. -            if cname in self.aliases:
  12. -                return self.aliases[cname]
  13. -            return cname
  14. -        except socket.herror:
  15. -            warning = "address resolution error for %s" % (address)
  16. -            self.logger.warning(warning)
  17. -            raise MetadataConsistencyError
  18. +        cname = socket.gethostbyaddr(address)[0].lower()
  19. +        if cname in self.aliases:
  20. +            return self.aliases[cname]
  21. +        return cname
  22. +        #try:
  23. +        #    cname = socket.gethostbyaddr(address)[0].lower()
  24. +        #    if cname in self.aliases:
  25. +        #        return self.aliases[cname]
  26. +        #    return cname
  27. +        #except socket.herror:
  28. +        #    warning = "address resolution error for %s" % (address)
  29. +        #    self.logger.warning(warning)
  30. +        #    raise MetadataConsistencyError
  31.  
  32.      def get_initial_metadata(self, client):
  33.          """Return the metadata for a given client."""
create a new version of this paste RAW Paste Data