[DRE-commits] [schleuder] 13/14: debian/patches: Drop obsolete patching of 'schleuder install'

[Georg Faerber]

This is an automated email from the git hooks/post-receive script.

georg-alioth-guest pushed a commit to branch schleuder/3.1.0-3
in repository schleuder.

commit 0087e6cecd79779c7e2703a6b3053aed7595f850
Author: Georg Faerber <georg at riseup.net>
Date:   Mon Jun 19 23:16:57 2017 +0200

    debian/patches: Drop obsolete patching of 'schleuder install'
    
    If upgrading schleuder 2 to 3, all existing lists data is now moved to
    '/var/backup/schleuder' in the preinst script, before calling 'schleuder
    install' in the postinst stage, hence drop the now obsolete patching
    which disabled the check for existing data.
    
    Closes #853841
---
 ...ble-upgrades.patch => 0001-lib-fix-paths.patch} | 23 +++++++---------------
 debian/patches/series                              |  2 +-
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/debian/patches/0001-lib-fix-paths-and-enable-upgrades.patch b/debian/patches/0001-lib-fix-paths.patch
similarity index 62%
rename from debian/patches/0001-lib-fix-paths-and-enable-upgrades.patch
rename to debian/patches/0001-lib-fix-paths.patch
index d2f5be6..951b388 100644
--- a/debian/patches/0001-lib-fix-paths-and-enable-upgrades.patch
+++ b/debian/patches/0001-lib-fix-paths.patch
@@ -1,9 +1,6 @@
-Description: lib/: Fix paths and ignore v2 data
+Description: lib/: Fix paths
  Use '/var/log/schleuder' for logging.
  
- Don't fail if '/var/lib/schleuder' contains data of a schleuder v2
- installation, to enable upgrades.
-
  Set the 'root_dir' to '/usr/lib/ruby/vendor_ruby/schleuder/'.
 
  Additionally, add '/usr/share/schleuder/locales/*.yml' to the locales
@@ -12,12 +9,12 @@ Description: lib/: Fix paths and ignore v2 data
  Upstream is aware of this patch and we're working on integrating it
  upstream.
 Author: Georg Faerber <georg at riseup.net>
-Last-Update: 2017-01-26
+Last-Update: 2017-06-19
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/lib/schleuder/conf.rb
 +++ b/lib/schleuder/conf.rb
-@@ -6,7 +6,7 @@
+@@ -7,7 +7,7 @@
  
      DEFAULTS = {
        'lists_dir' => '/var/lib/schleuder/lists',
@@ -28,24 +25,18 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
        'keyserver' => 'hkp://pool.sks-keyservers.net',
 --- a/lib/schleuder/cli.rb
 +++ b/lib/schleuder/cli.rb
-@@ -78,13 +78,7 @@
+@@ -78,7 +78,7 @@
      desc 'install', "Set-up or update Schleuder environment (create folders, copy files, fill the database)."
      def install
        config_dir = Pathname.new(ENV['SCHLEUDER_CONFIG']).dirname
 -      root_dir = Pathname.new(ENV['SCHLEUDER_ROOT'])
--
--      # Check if lists_dir contains v2-data.
--      if Dir.glob("#{Conf.lists_dir}/*/*/members.conf").size > 0
--        msg = "Lists directory #{Conf.lists_dir} appears to contain data from a Schleuder version 2.x installation.\nPlease move it out of the way or configure a different `lists_dir` in `#{ENV['SCHLEUDER_CONFIG']}`.\nTo migrate lists from Schleuder v2 to Schleuder v3 please use `schleuder migrate_v2_list` after the installation succeeded."
--        fatal msg, 2
--      end
 +      root_dir = Pathname.new('/usr/lib/ruby/vendor_ruby/schleuder/')
  
-       [Conf.lists_dir, Conf.listlogs_dir, config_dir].each do |dir|
-         dir = Pathname.new(dir)
+       # Check if lists_dir contains v2-data.
+       if Dir.glob("#{Conf.lists_dir}/*/*/members.conf").size > 0
 --- a/lib/schleuder.rb
 +++ b/lib/schleuder.rb
-@@ -74,6 +74,7 @@
+@@ -77,6 +77,7 @@
  end
  
  I18n.load_path += Dir["#{rootdir}/locales/*.yml"]
diff --git a/debian/patches/series b/debian/patches/series
index e7476bf..364ec50 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 0005-man-fix-log-path.patch
-0001-lib-fix-paths-and-enable-upgrades.patch
+0001-lib-fix-paths.patch
 0004-spec-remove-bundler.patch
 0003-bin-fix-require.patch
 0002-etc-fix-paths.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/schleuder.git