← Back to branch summary

~ubuntu-branches/ubuntu/trusty/system-tools-backends/trusty

« back to all changes in this revision

Viewing changes to debian/patches/04_empty_ntp.patch

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl
  • Date: 2011-10-22 17:15:14 UTC
  • mfrom: (1.1.34 upstream)
  • mto: This revision was merged to the branch mainline in revision 77.
  • Revision ID: james.westby@ubuntu.com-20111022171514-ilwj673pfui88z6x
* New upstream release.
* debian/watch:
  - Track .bz2 tarballs.
* Refresh debian/patches/04_empty_ntp.patch.
* Bump debhelper compatibility level to 8.
  - Update Build-Depends on debhelper.
  - Strip debian/tmp/ from .install files.
* debian/control.in:
 - Bump Standards-Version to 3.9.2. No further changes.
 - Update Vcs-* URLs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04_empty_ntp.patch
8
8
This caused other time syncing problems later (see e.g.
9
9
https://bugs.launchpad.net/bugs/83604).
10
10
---
11
 
diff --git a/Time/NTP.pm b/Time/NTP.pm
12
 
index e7be3a9..026ba3e 100644
13
 
--- a/Time/NTP.pm
14
 
+++ b/Time/NTP.pm
15
 
@@ -75,6 +75,11 @@ sub ntp_conf_replace
16
 
   my ($line_key, $val, $rest);
17
 
   my ($n, $ret);
 
11
Index: system-tools-backends-2.10.2/Time/NTP.pm
 
12
===================================================================
 
13
--- system-tools-backends-2.10.2.orig/Time/NTP.pm       2010-12-06 18:32:52.000000000 +0100
 
14
+++ system-tools-backends-2.10.2/Time/NTP.pm    2011-10-22 17:05:20.493458177 +0200
 
15
@@ -80,6 +80,11 @@
 
16
   # Notably, this avoids creating an empty file when simply running ntpdate.
 
17
   return if (!&Utils::File::exists ($file) && !@$value);
18
18
 
19
19
+  # If config file does not exist, and no server has to be written,
20
20
+  # don't create and empty file that will confuse package managers.
24
24
   &Utils::Report::enter ();
25
25
   &Utils::Report::do_report ("replace_split", $key, $file);
26
26
 
27
 
--
28
 
cgit v0.8.3-6-g21f6