← Back to branch summary

~ubuntu-branches/ubuntu/natty/pacemaker/natty

« back to all changes in this revision

Viewing changes to .pc/lib_license_headers_update.patch/lib/pengine/unpack.c

  • Committer: Bazaar Package Importer
  • Author(s): Andres Rodriguez
  • Date: 2011-01-12 10:12:46 UTC
  • mfrom: (1.1.6 upstream) (2.1.10 sid)
  • Revision ID: james.westby@ubuntu.com-20110112101246-d7cvgr509qjqd73q
Tags: 1.0.10-4ubuntu1
https://launchpad.net/bugs/701233
* Merge from debian unstable (LP: #701233).  Remaining changes:
  - debian/patches:
    + lib_license_headers_update.patch: Update the License Headers to
      correctly reflect the use of LGPL-2.1+.
    + other_license_headers_update.patch: Update the License Headers of
      files that show GPL version 2.1, to correctly show version 2+.
    + raexecupstart.patch: Utilize new upstart LRM plugin.
    + fix_ftbfs_linker_as_needed.patch: Prevent FTBFS due to linker changes.
    + fix_return_o2cb_ra.patch: Fix a return variale error in the o2cb RA.
  - debian/pacemaker.postinst: Fix permissions on /var/lib/pengine.
* debian/control:
  - Bump cluster-glue dependencies to Ubuntu specific.
  - pacemaker-dev binary: Update dependencies to correct ones:
    (libpe-status2-dev,libpe-rules2-dev)
  - libcrmcommon2-dev: Drop Depends on cluster-glue-dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/lib_license_headers_update.patch/lib/pengine/unpack.c
472
472
                online = TRUE;
473
473
                if(do_terminate) {
474
474
                    pe_fence_node(data_set, this_node, "because termination was requested");
475
 
                    this_node->details->shutdown = TRUE;
476
475
                }
477
476
 
478
477
            } else if(join_state == exp_state /* == NULL */) {
1427
1426
                        crm_xml_add(xml_op, XML_ATTR_UNAME, node->details->uname);
1428
1427
                        if(actual_rc_i != EXECRA_NOT_INSTALLED
1429
1428
                           || is_set(data_set->flags, pe_flag_symmetric_cluster)) {
1430
 
                            add_node_copy(data_set->failed, xml_op);
 
1429
                            if ((node->details->shutdown == FALSE) || (node->details->online == TRUE)) {
 
1430
                                add_node_copy(data_set->failed, xml_op);
 
1431
                            }
1431
1432
                        }
1432
1433
                }
1433
1434
                break;
1533
1534
                                 id, node->details->uname,
1534
1535
                                 execra_code2string(actual_rc_i), actual_rc_i);
1535
1536
                        crm_xml_add(xml_op, XML_ATTR_UNAME, node->details->uname);
1536
 
                        add_node_copy(data_set->failed, xml_op);
 
1537
                        if ((node->details->shutdown == FALSE) || (node->details->online == TRUE)) {
 
1538
                            add_node_copy(data_set->failed, xml_op);
 
1539
                        }
1537
1540
 
1538
1541
                        if(*on_fail < action->on_fail) {
1539
1542
                                *on_fail = action->on_fail;