Further fix to attribute ordering.

Author: pp-mo

lib/iris/fileformats/netcdf/saver.py

@@ -1687,25 +1687,25 @@ def _set_cf_var_attributes(self, cf_var, element):
         #   whereas for data-variables (aka Cubes) it is the other way around.
         # Needed now that this routine is also called from _create_cf_data_variable.
         # TODO: when we can break things, rationalise these to be the same.
-        def add_units():
+        def add_units_attr():
             if cf_units.as_unit(units_str).is_udunits():
                 _setncattr(cf_var, "units", units_str)
 
-        def add_stdname():
+        def add_names_attrs():
             standard_name = element.standard_name
             if standard_name is not None:
                 _setncattr(cf_var, "standard_name", standard_name)
 
+            long_name = element.long_name
+            if long_name is not None:
+                _setncattr(cf_var, "long_name", long_name)
+
         if isinstance(element, Cube):
-            add_stdname()
-            add_units()
+            add_names_attrs()
+            add_units_attr()
         else:
-            add_units()
-            add_stdname()
-
-        long_name = element.long_name
-        if long_name is not None:
-            _setncattr(cf_var, "long_name", long_name)
+            add_units_attr()
+            add_names_attrs()
 
         # Add the CF-netCDF calendar attribute.
         if element.units.calendar: