Mailinglist Archive: opensuse-commit (861 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package bash-completion for openSUSE:Factory
checked in at Fri Jan 14 04:16:56 CET 2011.



--------
--- bash-completion/bash-completion.changes     2011-01-07 15:09:07.000000000 
+0100
+++ bash-completion/bash-completion.changes     2011-01-13 10:16:18.000000000 
+0100
@@ -1,0 +2,6 @@
+Thu Jan 13 10:13:48 CET 2011 - vuntz@xxxxxxxxxxxx
+
+- Add bash-completion-fix-service.patch to fix an error created by
+  the "service" completion.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  bash-completion-fix-service.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ bash-completion.spec ++++++
--- /var/tmp/diff_new_pack.QJTbGr/_old  2011-01-14 04:16:32.000000000 +0100
+++ /var/tmp/diff_new_pack.QJTbGr/_new  2011-01-14 04:16:32.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package bash-completion (Version 1.2)
+# spec file for package bash-completion
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,12 +19,14 @@
 
 Name:           bash-completion
 Version:        1.2
-Release:        1
+Release:        2
 License:        GPLv2+
 Summary:        Programmable Completion for Bash
 Url:            http://bash-completion.alioth.debian.org/
 Group:          System/Shells
 Source0:        
http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM bash-completion-fix-service.patch vuntz@xxxxxxxxxxxx -- 
Fix the "service" completion to not create an error, 
http://git.debian.org/?p=bash-completion/bash-completion.git;a=patch;h=1f8b55a92aba6d03bb4c43dade1f8b2e2b847b61
+Patch0:         bash-completion-fix-service.patch
 Requires:       bash
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
@@ -35,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure

++++++ bash-completion-fix-service.patch ++++++

m 1f8b55a92aba6d03bb4c43dade1f8b2e2b847b61 Mon Sep 17 00:00:00 2001
From: David Paleino <dapal@xxxxxxxxxx>
Date: Thu, 17 Jun 2010 17:43:18 +0200
Subject: [PATCH] Fixed "service" completion, thanks to John Hedges (Debian: 
#586210)

  The patch makes it safe even when every file in /etc/init.d/*
  has a proper completion (unlikely, but seems like it happened).

  Thanks to John Hedges <john@xxxxxxxxxxxxxx> for the patch, slightly
  modified to make it more compact.
---
 CHANGES         |    2 +-
 contrib/service |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/contrib/service b/contrib/service
index 9ebd117..f27222a 100644
--- a/contrib/service
+++ b/contrib/service
@@ -32,9 +32,10 @@ _service()
     return 0
 } &&
 complete -F _service service
-[ -d /etc/init.d/ ] && complete -F _service -o default \
-    $(for i in /etc/init.d/*; do
-    complete -p ${i##*/} &>/dev/null || printf '%s\n' ${i##*/}; done)
+[ -d /etc/init.d/ ] && (
+    services=$(for i in /etc/init.d/*; do
+        complete -p ${i##*/} &>/dev/null || printf '%s\n' ${i##*/}; done)
+    [ -n "$services" ] && complete -F _service -o default $services;)
 
 # Local variables:
 # mode: shell-script
-- 
1.7.1

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx