← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~jtv/maas/upper-linter into lp:maas

 

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/upper-linter into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jtv/maas/upper-linter/+merge/109207

This breaks up the offending line.  It escapes the newline it introduces right at the python parsing stage, so the only change in output will be a few extra spaces from the extra indentation where the line is continued.  Thus it shouldn't depend on any details of the dhcpd's config parser.


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/upper-linter/+merge/109207
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/upper-linter into lp:maas.
=== modified file 'src/provisioningserver/dhcp/config.py'
--- src/provisioningserver/dhcp/config.py	2012-06-07 02:43:49 +0000
+++ src/provisioningserver/dhcp/config.py	2012-06-07 18:16:30 +0000
@@ -28,7 +28,8 @@
       match if substring (option vendor-class-identifier, 0, 9) = "PXEClient";
     }
     class "uboot-highbank" {
-      match if substring (option vendor-class-identifier, 0, 21) = "U-boot.armv7.highbank";
+      match if substring (option vendor-class-identifier, 0, 21) = \
+        "U-boot.armv7.highbank";
     }
 
     subnet %(subnet)s netmask %(subnet_mask)s {