Merge lp:~didrocks/quickly/install-in-opt into lp:quickly

[Didier Roche-Tolomelli]

The branch which makes the application review board happy :)

see my comment at
https://bugs.launchpad.net/ubuntu/+source/quickly/+bug/625581

Still some work to do, like create a symlink for the .desktop file and such, but anything should now be installed in /opt/<appname> with "quickly submitubuntu".

[Michael Terry (mterry)]

+# Copyright 2009 Didier Roche

Should that be 2010 Canonical?

17 + command = ['python-mkdebian', '--force-control', '--force-rules']

You probably want to version-guard --force-rules like we did for --force-copyright.

Could we call it 'submit' rather than 'submitubuntu'?

Could we not reduce the duplicated logic between 'submitubuntu' and 'release' more?

Is there a reason we don't just default installopt to True? Seems bad for developers to be testing one thing and submitting a different one. Especially since any hard-coded paths they used will want to be different.

[Didier Roche-Tolomelli (didrocks)]

+# Copyright 2009 Didier Roche

Should that be 2010 Canonical?

No, Quickly doesn't have copyright assignment and I didn't work on that part on my Canonical time (I just added an option to it)? So keeping original file copyright make sense.

17 + command = ['python-mkdebian', '--force-control', '--force-rules']
I'll update that, and also add linking the right file.

Could we not reduce the duplicated logic between 'submitubuntu' and 'release' more?

Is there a reason we don't just default installopt to True? Seems bad for developers to be testing one thing and submitting a different one. Especially since any hard-coded paths they used will want to be different.

Did you read my comment as pointed from the original message?
https://bugs.launchpad.net/ubuntu/+source/quickly/+bug/625581/comments/10

I agree with that, but that's wont be an alpha1 target given the time I have. All the testing issue is also discussed in the comment linked above and I want that we discuss that during alpha1 and alpha2 to make submitubuntu a more useful command.

[lp:~didrocks/quickly/install-in-opt]

563. By Didier Roche-Tolomelli on 2010-11-15

add support in project_name for running application in /opt/appname

564. By Didier Roche-Tolomelli on 2010-11-15

force rules under conditions

565. By Didier Roche-Tolomelli on 2010-11-16

support upgrade for /opt support and add a function to make the safe add easy

[Didier Roche-Tolomelli (didrocks)]

pushed the previous remark fixes. Handle now upgrades as well.

I've created a convenient function for replacing some text in files between a start and end marker. Maybe some of our function (like licence) should starts using it.

[lp:~didrocks/quickly/install-in-opt]

566. By Didier Roche-Tolomelli on 2010-11-16

install in /opt/extras

[Michael Terry (mterry)]

/opt/extras should be /opt/extras.ubuntu.com according to the discussion in the mailing list, I believe. But you mention that you are waiting for final, final approval.

15 if get_python_mkdebian_version() > 2.22:
16 command.append("--force-copyright")
17 + if get_python_mkdebian_version() > 2.23:
18 + command.append("--force-rules")

Should just be:

if get_python_mkdebian_version() > 2.22:
    command.append("--force-copyright")
    command.append("--force-rules")

as --force-rules was added in 2.23.

+print _("Then your application will be reviewed by the application review board.")

I didn't see anything that would notify the ARB. I assume that's a TODO item?

+def update_file_content(filename, start_marker, end_marker, replacing_content):

Nice function. :) Though ideally, it would use set_file_contents() from quicklyutils.py (after moving it to templatetools).

[Didier Roche-Tolomelli (didrocks)]

/opt/extras should be /opt/extras.ubuntu.com according to the discussion in the mailing list, I believe. But you mention that you are waiting for final, final approval.

15 if get_python_mkdebian_version() > 2.22:
16 command.append("--force-copyright")
17 + if get_python_mkdebian_version() > 2.23:
18 + command.append("--force-rules")

Should just be:

if get_python_mkdebian_version() > 2.22:
    command.append("--force-copyright")
    command.append("--force-rules")

as --force-rules was added in 2.23.

oopss, fixing

+print _("Then your application will be reviewed by the application review board.")

I didn't see anything that would notify the ARB. I assume that's a TODO item?

Right, as mentionned and pending email on the ARB about "what to do with the submitubuntu command, should we always install in /opt?"

+def update_file_content(filename, start_marker, end_marker, replacing_content):

Nice function. :) Though ideally, it would use set_file_contents() from quicklyutils.py (after moving it to templatetools).

Not really the same the same, set_files_contents exchanges some values, here this one is to add/remove content between tags. the licence command should use it.

[lp:~didrocks/quickly/install-in-opt]

567. By Didier Roche-Tolomelli on 2010-11-22

force versionning

568. By Didier Roche-Tolomelli on 2010-11-22

use extras.ubuntu.com

[Didier Roche-Tolomelli (didrocks)]

pushed the new version, I mixed the update_file_content function. Well free to merge it with my function :)

[Michael Terry (mterry)]

> Not really the same the same, set_files_contents exchanges some values, here this one is to add/remove content between tags. the licence command should use it.

I know they aren't the same. I was proposing that your new function use the existing set_file_contents() function instead of duplicating the whole .new/os.rename stuff again.

[Didier Roche-Tolomelli (didrocks)]

it can't really use it, it should rather deprecate it as there are some operations done while going through the loop) or wrapping it, like set_file_contents call update_file_content(destfile, openmarker=None, endmarker=None, sourcefile.read()), isn't it?

[Allison Randal (allison)]

> /opt/extras should be /opt/extras.ubuntu.com according to the discussion in
> the mailing list, I believe. But you mention that you are waiting for final,
> final approval.

Rick asked me to comment here. It's 98% sure the Tech Board will approve /opt/extras.ubuntu.com in the meeting next Tuesday (the interested TB members were involved in the ubuntu-devel discussion, and it's the only answer that satisfies all the concerns of various people). So, safe to merge before Tuesday, if that's the last thing holding up the merge.

[Didier Roche-Tolomelli (didrocks)]

Thanks Allison, there is still the question sent to the ARB and the "do we install always in /opt or just in the submitubuntu command and what to do with that command (and rename it to "submit"), but I think we can get to that later…

Michael: ok to merge? We will merge all the with: for writing in a file function later if you don't mind (like license, renaming and replace… and so on…)

[Michael Terry (mterry)]

Approved, if you fix

37 + opt_path = path.replace('/usr', '/opt/extras/python_name')

To use extras.ubuntu.com

review: Approve

[Didier Roche-Tolomelli (didrocks)]

argh, a one leftover :)
doing and done!

=== modified file 'data/templates/ubuntu-application/internal/packaging.py'
--- data/templates/ubuntu-application/internal/packaging.py	2010-11-22 16:01:03 +0000
+++ data/templates/ubuntu-application/internal/packaging.py	2010-11-22 16:47:10 +0000
@@ -162,7 +162,7 @@
     version = proc.communicate()[0]
     return float(version)
 
-def updatepackaging(changelog=None, no_changelog=False):
+def updatepackaging(changelog=None, no_changelog=False, installopt=False):
     """create or update a package using python-mkdebian.
 
     Commit after the first packaging creation"""
@@ -172,8 +172,11 @@
     command = ['python-mkdebian', '--force-control']
     if get_python_mkdebian_version() > 2.22:
         command.append("--force-copyright")
+        command.append("--force-rules")
     if no_changelog:
         command.append("--no-changelog")
+    if installopt:
+       command.append("--prefix=/opt/extras.ubuntu.com/%s" % configurationhandler.project_config['project'])
     for message in changelog:
         command.extend(["--changelog", message])
     if not configurationhandler.project_config:
 
=== modified file 'data/templates/ubuntu-application/project_root/bin/project_name'
--- data/templates/ubuntu-application/project_root/bin/project_name	2010-11-17 18:44:18 +0000
+++ data/templates/ubuntu-application/project_root/bin/project_name	2010-11-22 16:47:10 +0000
@@ -16,10 +16,20 @@
 PROJECT_ROOT_DIRECTORY = os.path.abspath(
     os.path.dirname(os.path.dirname(os.path.realpath(sys.argv[0]))))
 
+python_path = []
+if os.path.abspath(__file__).startswith('/opt'):
+    syspath = sys.path[:] # copy to avoid infinite loop in pending objects
+    for path in syspath:
+        opt_path = path.replace('/usr', '/opt/extras/python_name')
+        python_path.insert(0, opt_path)
+        sys.path.insert(0, opt_path)
 if (os.path.exists(os.path.join(PROJECT_ROOT_DIRECTORY, 'python_name'))
     and PROJECT_ROOT_DIRECTORY not in sys.path):
+    python_path.insert(0, PROJECT_ROOT_DIRECTORY)
     sys.path.insert(0, PROJECT_ROOT_DIRECTORY)
-    os.putenv('PYTHONPATH', PROJECT_ROOT_DIRECTORY) # for subprocesses
+if python_path:
+    os.putenv('PYTHONPATH', "%s:%s" % (os.getenv('PYTHONPATH', ''), ':'.join(python_path))) # for subprocesses
+
 
 from python_name import (Basecamel_case_nameWindow)
 import python_name.helpers as helpers
 
=== added file 'data/templates/ubuntu-application/submitubuntu.py'
--- data/templates/ubuntu-application/submitubuntu.py	1970-01-01 00:00:00 +0000
+++ data/templates/ubuntu-application/submitubuntu.py	2010-11-22 16:47:10 +0000
@@ -0,0 +1,297 @@
+#!/usr/bin/python
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2009 Didier Roche
+#
+# This file is part of Quickly ubuntu-application template
+#
+#This program is free software: you can redistribute it and/or modify it
+#under the terms of the GNU General Public License version 3, as published
+#by the Free Software Foundation.
+
+#This program is distributed in the hope that it will be useful, but
+#WITHOUT ANY WARRANTY; without even the implied warranties of
+#MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+#PURPOSE.  See the GNU General Public License for more details.
+
+#You should have received a copy of the GNU General Public License along
+#with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import sys
+import subprocess
+import webbrowser
+
+from internal import quicklyutils, packaging, launchpad_helper
+from internal import bzrutils
+from quickly import templatetools, configurationhandler, commands
+import license
+
+import logging
+
+from quickly import launchpadaccess
+
+import gettext
+from gettext import gettext as _
+gettext.textdomain('quickly')
+
+options = ["--ppa",]
+
+def usage():
+    templatetools.print_usage(_('quickly submitubuntu [--ppa <ppa | group/ppa>] [release-version] [comments]'))
+def help():
+    print _("""Posts a release of your project and submit it the ubuntu
+application review board so that any users can see and install the
+application ont their system.
+
+Before running quickly submitubuntu, you should: create your account
+and a project page on http://launchpad.net.
+You also have to add a PPA to your launchpad account.
+
+Name, email, and version will be automatically changed in setup.py and
+bzr will tag the current source with the new version number.
+
+If not specified, the new version number will be 'YEAR.MONTH[.RELEASE]'.
+
+For example, the third release in July 2010 would be versioned 10.07.2.
+
+You may want to make sure that the description and long description in
+setup.py are up to date before releasing.
+
+You can optionally run 'quickly package' and test your package to make
+sure it installs as expected.""")
+def shell_completion(argv):
+    ''' Complete --args '''
+    # option completion
+    rv = []
+    if argv[-1].startswith("-"):
+        rv = options
+    elif len(argv) > 1 and argv[-2] == '--ppa': # if argument following --ppa, complete by ppa
+        rv = packaging.shell_complete_ppa(argv[-1])
+    if rv:
+        rv.sort()
+        print ' '.join(rv)
+
+templatetools.handle_additional_parameters(sys.argv, help, shell_completion, usage=usage)
+
+
+launchpad = None
+project = None
+ppa_name = None
+i = 0
+args = []
+argv = sys.argv
+
+while i < len(argv):
+    arg = argv[i]
+    if arg.startswith('-'):
+        if arg == '--ppa':
+            if i + 1 < len(argv):
+                ppa_name = argv[i + 1]
+                i += 1
+            else:
+                cmd = commands.get_command('submitubuntu', 'ubuntu-application')
+                templatetools.usage_error(_("No PPA provided."), cmd=cmd)
+        else:
+            cmd = commands.get_command('submitubuntu', 'ubuntu-application')
+            templatetools.usage_error(_("Unknown option: %s."  % arg), cmd=cmd)
+    else:
+        args.append(arg)
+    i += 1
+
+    commit_msg = None
+if len(args) == 1:
+    proposed_version = None
+elif len(args) == 2:
+    proposed_version = args[1]
+elif len(args) > 2:
+    proposed_version = args[1]
+    commit_msg = " ".join(args[2:])
+
+# warning: project_name can be different from project.name (one local, one on launchpad)
+if not configurationhandler.project_config:
+    configurationhandler.loadConfig()
+project_name = configurationhandler.project_config['project']
+
+# connect to LP
+try:
+    launchpad = launchpadaccess.initialize_lpi()
+except launchpadaccess.launchpad_connection_error, e:
+    print(e)
+    sys.exit(1)
+
+# push the gpg key and email to the env
+try:
+    keyid = quicklyutils.get_right_gpg_key_id(launchpad)
+except quicklyutils.gpg_error, e:
+    print(e)
+    sys.exit(1)
+
+# get the project now and save the url into setup.py
+try:
+    project = launchpadaccess.get_project(launchpad)
+except launchpadaccess.launchpad_project_error, e:
+    print(e)
+    sys.exit(1)
+project_url  = launchpadaccess.launchpad_url + '/' + project.name
+quicklyutils.set_setup_value('url', project_url)
+about_dialog_file_name = quicklyutils.get_about_file_name()
+if about_dialog_file_name:
+    quicklyutils.change_xml_elem(about_dialog_file_name, "object/property",
+                                 "name", "website", project_url, {})
+
+# choose right ppa parameter (users, etc.) ppa or staging if ppa_name is None
+try:
+    (ppa_user, ppa_name, dput_ppa_name, ppa_url) = packaging.choose_ppa(launchpad, ppa_name)
+except packaging.user_team_not_found, e:
+    print(_("User or Team %s not found on Launchpad") % e)
+    sys.exit(1)
+except packaging.not_ppa_owner, e:
+    print(_("You have to be a member of %s team to upload to its ppas") % e)
+    sys.exit(1)
+
+try:
+    ppa_name = packaging.check_and_return_ppaname(launchpad, ppa_user, ppa_name) # ppa_name can be ppa name or ppa display name. Find the right one if exists
+except packaging.ppa_not_found, e:
+    print(_("%s does not exist. Please create it on launchpad if you want to push a package to it. %s has the following ppas available:") % (e, ppa_user.name))
+    user_has_ppa = False
+    for ppa_name, ppa_display_name in packaging.get_all_ppas(launchpad, ppa_user):
+        print "%s - %s" % (ppa_name, ppa_display_name)
+        user_has_ppa = True
+    if user_has_ppa:
+        print(_("You can temporary choose one of them with --ppa switch or definitely by executing quickly configure ppa <ppa_name>."))
+    sys.exit(1)
+
+# update license if needed. Don't change anything if not needed
+try:
+    license.licensing()
+except license.LicenceError, error_message:
+    print(error_message)
+    sys.exit(1)
+
+try:
+    release_version = packaging.updateversion(proposed_version)
+except (packaging.invalid_versionning_scheme,
+        packaging.invalid_version_in_setup), error_message:
+    print(error_message)
+    sys.exit(1)
+
+if commit_msg is None:
+    commit_msg = _('quickly released: %s' % release_version)
+
+
+# check if already released with this name
+bzr_instance = subprocess.Popen(["bzr", "tags"], stdout=subprocess.PIPE)
+bzr_tags, err = bzr_instance.communicate()
+if bzr_instance.returncode !=0:
+    print(err)
+    sys.exit(1)
+if release_version in bzr_tags:
+    print _("ERROR: quickly can't release: %s seems to be already released. Choose another name.") % release_version
+    sys.exit(1)
+
+# commit current changes
+packaging.filter_exec_command(["bzr", "add"])
+return_code = packaging.filter_exec_command(["bzr", "commit", '--unchanged', '-m',
+                                _('commit before release')])
+if return_code != 0 and return_code != 3:
+    print _("ERROR: quickly can't release as it can't commit with bzr")
+    sys.exit(return_code)
+
+# try to get last available version in bzr
+previous_version = None
+bzr_instance = subprocess.Popen(['bzr', 'tags', '--sort=time'],
+                                 stdout=subprocess.PIPE)    
+result, err = bzr_instance.communicate()
+if bzr_instance.returncode == 0 and result:
+    output = result.split('\n')
+    output.reverse()
+    for tag_line in output:
+        tag_elem = tag_line.split (' ')
+        if not (tag_elem[-1] == '?' or tag_elem[-1] == ''):
+            previous_version = tag_elem[0]
+            break
+
+changelog = quicklyutils.collect_commit_messages(previous_version)
+# creation/update debian packaging
+return_code = packaging.updatepackaging(changelog, installopt=True)
+if return_code != 0:
+    print _("ERROR: can't create or update ubuntu package")
+    sys.exit(1)
+
+# add files, setup release version, commit and push !
+#TODO: check or fix if we don't have an ssh key (don't tag otherwise to be able to release again)
+packaging.filter_exec_command(["bzr", "add"])
+return_code = packaging.filter_exec_command(["bzr", "commit", '-m', commit_msg])
+if return_code != 0 and return_code != 3:
+    print _("ERROR: quickly can't release as it can't commit with bzr")
+    sys.exit(return_code)
+packaging.filter_exec_command(["bzr", "tag", release_version]) # tag revision
+
+# check if pull branch is set
+bzr_instance = subprocess.Popen(["bzr", "info"], stdout=subprocess.PIPE)
+bzr_info, err = bzr_instance.communicate()
+if bzr_instance.returncode !=0:
+    print(err)
+    sys.exit(1)
+
+
+if (launchpadaccess.lp_server == "staging"):
+    bzr_staging = "//staging/"
+else:
+    bzr_staging = ""
+
+custom_location_in_info = None
+branch_location = []
+custom_location = bzrutils.get_bzrbranch()
+if custom_location:
+    branch_location = [custom_location]
+    custom_location_in_info = custom_location.replace('lp:', '')
+# if no branch, create it in ~user_name/project_name/quickly_trunk
+# or switch from staging to production
+if ("parent branch" in bzr_info) and not (
+    (custom_location_in_info and custom_location_in_info not in bzr_info) or
+   ((".staging." in bzr_info) and not bzr_staging) or
+   (not (".staging." in bzr_info) and bzr_staging)):
+    return_code = packaging.filter_exec_command(["bzr", "pull"])
+    if return_code != 0:
+        print _("ERROR: quickly can't release: can't pull from launchpad.")
+        sys.exit(return_code)
+
+    return_code = packaging.filter_exec_command(["bzr", "push"])
+    if return_code != 0:
+        print _("ERROR: quickly can't release: can't push to launchpad.")
+        sys.exit(return_code)
+else:
+    if not branch_location:
+        branch_location = ['lp:', bzr_staging, '~', launchpad.me.name, '/', project.name, '/quickly_trunk']
+    return_code = packaging.filter_exec_command(["bzr", "push", "--remember", "--overwrite", "".join(branch_location)])
+    if return_code != 0:
+        print _("ERROR: quickly can't release: can't push to launchpad.")
+        sys.exit(return_code)
+
+    # make first pull too
+    return_code = packaging.filter_exec_command(["bzr", "pull", "--remember", "".join(branch_location)])
+    if return_code != 0:
+        print _("ERROR: quickly can't release correctly: can't pull from launchpad.")
+        sys.exit(return_code)
+
+
+# upload to launchpad
+print _("pushing to launchpad")
+return_code = packaging.push_to_ppa(dput_ppa_name, "../%s_%s_source.changes" % (project_name, release_version), keyid=keyid) != 0
+if return_code != 0:
+    sys.exit(return_code)
+
+#create new release_date
+launchpad_helper.push_tarball_to_launchpad(project, release_version,
+                                    "../%s_%s.tar.gz" % (project_name,
+                                    release_version), changelog)
+
+print _("%s %s released and submitted to ubuntu. Wait for half an hour and have look at %s.") % (project_name, release_version, ppa_url)
+print _("Then your application will be reviewed by the application review board.")
+
+# as launchpad-open doesn't support staging server, put an url
+if launchpadaccess.lp_server == "staging":
+    webbrowser.open(launchpadaccess.LAUNCHPAD_CODE_STAGING_URL + '/' + project.name)
+else:
+    webbrowser.open(launchpadaccess.LAUNCHPAD_URL + '/' + project.name)
 
=== modified file 'data/templates/ubuntu-application/upgrade.py'
--- data/templates/ubuntu-application/upgrade.py	2010-09-28 12:53:04 +0000
+++ data/templates/ubuntu-application/upgrade.py	2010-11-22 16:47:10 +0000
@@ -171,4 +171,30 @@
     os.system("find . -name '*.py' -exec %s {} \;" % sedline)
     os.system("%s bin/%s" % (sedline, project_name))
 
+### 0.7 update
+if project_version < '0.7':
+    # support /opt installation
+    content_to_update = '''python_path = []
+if os.path.abspath(__file__).startswith('/opt'):
+    syspath = sys.path[:] # copy to avoid infinite loop in pending objects
+    for path in syspath:
+        opt_path = path.replace('/usr', '/opt/extras.ubuntu.com/%(python_name)s')
+        python_path.insert(0, opt_path)
+        sys.path.insert(0, opt_path)
+if (os.path.exists(os.path.join(PROJECT_ROOT_DIRECTORY, '%(python_name)s'))
+    and PROJECT_ROOT_DIRECTORY not in sys.path):
+    python_path.insert(0, PROJECT_ROOT_DIRECTORY)
+    sys.path.insert(0, PROJECT_ROOT_DIRECTORY)
+if python_path:
+    os.putenv('PYTHONPATH', "%%s:%%s" %% (os.getenv('PYTHONPATH', ''), ':'.join(python_path))) # for subprocesses''' % {'python_name' : python_name}
+
+    try:
+        templatetools.update_file_content("./bin/%s" % project_name,
+                'if (os.path.exists(os.path.join(PROJECT_ROOT_DIRECTORY',
+                "    os.putenv('PYTHONPATH', PROJECT_ROOT_DIRECTORY) # for subprocesses",
+                content_to_update)
+    except templatetools.CantUpdateFile, e:
+        print _("WARNING: can't update your project to support /opt. This doesn't mind if you don't plan to submit your project to the application review board. Cause is: %s" % e)
+
+
 sys.exit(0)
 
=== modified file 'quickly/quicklyconfig.py'
--- quickly/quicklyconfig.py	2010-10-06 09:52:51 +0000
+++ quickly/quicklyconfig.py	2010-11-22 16:47:10 +0000
@@ -20,7 +20,7 @@
 # you're warned :)
 
 # quickly version used for project format compatibility
-__version__ = '0.6.1'
+__version__ = '0.7'
 
 # where quickly will head for quickly data (for instance, templates)
 # by default, this is ../data, relative to trunk layout
 
=== modified file 'quickly/templatetools.py'
--- quickly/templatetools.py	2010-10-15 20:26:19 +0000
+++ quickly/templatetools.py	2010-11-22 16:47:10 +0000
@@ -31,6 +31,11 @@
 
 class bad_project_name(Exception):
     pass
+class CantUpdateFile(Exception):
+    def __init__(self, msg):
+        self.msg = msg
+    def __str__(self):
+        return self.msg
 
 def handle_additional_parameters(args, help=None, shell_completion=None, usage=None):
     """Enable handling additional parameter like help or shell_completion"""
@@ -88,6 +93,46 @@
     mode = stat.S_IMODE(st.st_mode)
     os.chmod(dest_file_name, mode)
 
+def update_file_content(filename, start_marker, end_marker, replacing_content):
+    """Safely replace the content of a file"""
+
+    skip_until_end_found = False
+    marker_found = False
+    try:
+        filename = os.path.abspath(filename)
+        ftarget_file_name = file(filename, 'r')
+        ftarget_file_name_out = file(ftarget_file_name.name + '.new', 'w')
+        for line in ftarget_file_name:
+            # seek if we have to add something
+            if start_marker in line:
+                skip_until_end_found = True
+                marker_found = True
+                ftarget_file_name_out.write(replacing_content)
+
+            if end_marker in line:
+                skip_until_end_found = False
+
+            if not skip_until_end_found:
+                ftarget_file_name_out.write(line)
+
+        ftarget_file_name.close()
+        ftarget_file_name_out.close()
+
+        if skip_until_end_found: # that means we didn't find the end_tag, don't copy the file
+            os.remove(ftarget_file_name_out.name)
+            raise CantUpdateFile(_("%s was not found in the file %s.") % (end_marker, ftarget_file_name.name))
+
+        if not marker_found:
+             os.remove(ftarget_file_name_out.name)
+             raise CantUpdateFile(_("%s was not found in the file %s.") % (start_marker, ftarget_file_name.name))
+
+        apply_file_rights(ftarget_file_name.name, ftarget_file_name_out.name)
+        os.rename(ftarget_file_name_out.name, ftarget_file_name.name)
+
+    except (OSError, IOError), e:
+        msg = _("%s file was not found or can't update it") % ftarget_file_name
+        raise CantUpdateFile(msg)
+
 def in_verbose_mode():
     """Return true if verbose mode is on"""