~ubuntu-core-dev/update-manager/main

« back to all changes in this revision

Viewing changes to DistUpgrade/imported/invoke-rc.d.diff

  • Committer: Michael Terry
  • Date: 2012-06-07 15:06:56 UTC
  • mto: This revision was merged to the branch mainline in revision 2509.
  • Revision ID: michael.terry@canonical.com-20120607150656-7qv9c4fg7o3qk7ab
first pass at splitting out release code

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
--- /usr/sbin/invoke-rc.d       2007-08-10 18:15:28.000000000 +0200
2
 
+++ invoke-rc.d 2007-09-07 18:43:48.000000000 +0200
3
 
@@ -314,6 +314,10 @@
4
 
     shift
5
 
   done
6
 
   if test x${doexit} != x && test x${RETRY} = x; then
7
 
+       if [ -n "$RELEASE_UPGRADE_IN_PROGRESS" ]; then
8
 
+           printerror "release upgrade in progress, error is not fatal"
9
 
+           exit 0
10
 
+       fi
11
 
      exit ${doexit}
12
 
   fi
13
 
   return 0
14
 
@@ -431,6 +435,10 @@
15
 
            fi
16
 
        done
17
 
        printerror initscript ${INITSCRIPTID}, action \"${saction}\" failed.
18
 
+       if [ -n "$RELEASE_UPGRADE_IN_PROGRESS" ]; then
19
 
+           printerror "release upgrade in progress, error is not fatal"
20
 
+           exit 0
21
 
+       fi
22
 
        exit ${RC}
23
 
     fi
24
 
     exit 102