Update to backintime-common-1.0.4.
This commit is contained in:
ajacoutot
parent
f6b72229b6
commit
53a6778780
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile.inc,v 1.2 2010/08/30 17:57:31 fgsch Exp $
|
||||
# $OpenBSD: Makefile.inc,v 1.3 2010/11/05 16:39:10 ajacoutot Exp $
|
||||
|
||||
V= 0.9.26
|
||||
V= 1.0.4
|
||||
BASENAME= backintime-${V}
|
||||
DISTNAME= ${BASENAME}_src
|
||||
REVISION = 0
|
||||
|
||||
CATEGORIES+= sysutils
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (backintime-0.9.26_src.tar.gz) = ilPR91fM+kOXVPSoucs+SQ==
|
||||
RMD160 (backintime-0.9.26_src.tar.gz) = notr5lsEWzMNV1HW5SSo1V1P29I=
|
||||
SHA1 (backintime-0.9.26_src.tar.gz) = PaR3sPqp70Z1Z278PNmQCq1ffXY=
|
||||
SHA256 (backintime-0.9.26_src.tar.gz) = zoHW7pks4Nvb4nQJ8FVCFWOr5osi1mw2JRswV+kZqX0=
|
||||
SIZE (backintime-0.9.26_src.tar.gz) = 872171
|
||||
MD5 (backintime-1.0.4_src.tar.gz) = rJ/QeLaXggu3BkO6s9obUw==
|
||||
RMD160 (backintime-1.0.4_src.tar.gz) = Cl3nbvdJKxMX6ACL1WG1vTvE9TM=
|
||||
SHA1 (backintime-1.0.4_src.tar.gz) = Ea0hwJyHskO3fQ00q1GeMARaRu4=
|
||||
SHA256 (backintime-1.0.4_src.tar.gz) = ihrchLSYbAqv1NlfYAkYQ+Quh/VhoW6Vc4MAznSdlwk=
|
||||
SIZE (backintime-1.0.4_src.tar.gz) = 226963
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-common_backintime,v 1.1.1.1 2010/05/04 12:53:49 ajacoutot Exp $
|
||||
--- common/backintime.orig Tue May 4 09:31:19 2010
|
||||
+++ common/backintime Tue May 4 09:31:41 2010
|
||||
$OpenBSD: patch-common_backintime,v 1.2 2010/11/05 16:39:10 ajacoutot Exp $
|
||||
--- common/backintime.orig Sun Jul 4 14:30:19 2010
|
||||
+++ common/backintime Fri Nov 5 17:27:39 2010
|
||||
@@ -20,8 +20,8 @@
|
||||
if [ -f backintime.py ]; then
|
||||
APP_PATH="."
|
||||
@ -9,6 +9,6 @@ $OpenBSD: patch-common_backintime,v 1.1.1.1 2010/05/04 12:53:49 ajacoutot Exp $
|
||||
+ APP_PATH="${PREFIX}/share/backintime/common"
|
||||
fi
|
||||
|
||||
-python $APP_PATH/backintime.py $*
|
||||
+${MODPY_BIN} $APP_PATH/backintime.py $*
|
||||
-python $APP_PATH/backintime.py "$@"
|
||||
+${MODPY_BIN} $APP_PATH/backintime.py "$@"
|
||||
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-common_backintime_py,v 1.1 2010/11/05 16:39:10 ajacoutot Exp $
|
||||
--- common/backintime.py.orig Fri Nov 5 16:22:03 2010
|
||||
+++ common/backintime.py Fri Nov 5 16:22:10 2010
|
||||
@@ -32,8 +32,6 @@ _=gettext.gettext
|
||||
|
||||
def take_snapshot_now_async( cfg ):
|
||||
cmd = "backintime --profile \"%s\" --backup &" % cfg.get_profile_name()
|
||||
- if cfg.is_run_ionice_from_user_enabled():
|
||||
- cmd = 'ionice -c2 -n7 ' + cmd
|
||||
os.system( cmd )
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-common_config_py,v 1.1.1.1 2010/05/04 12:53:49 ajacoutot Exp $
|
||||
--- common/config.py.orig Tue May 4 10:28:34 2010
|
||||
+++ common/config.py Tue May 4 10:29:26 2010
|
||||
@@ -27,7 +27,7 @@ import tools
|
||||
$OpenBSD: patch-common_config_py,v 1.2 2010/11/05 16:39:10 ajacoutot Exp $
|
||||
--- common/config.py.orig Wed Oct 27 21:56:06 2010
|
||||
+++ common/config.py Fri Nov 5 16:21:44 2010
|
||||
@@ -29,7 +29,7 @@ import logger
|
||||
|
||||
_=gettext.gettext
|
||||
|
||||
@ -10,9 +10,9 @@ $OpenBSD: patch-common_config_py,v 1.1.1.1 2010/05/04 12:53:49 ajacoutot Exp $
|
||||
gettext.textdomain( 'backintime' )
|
||||
|
||||
|
||||
@@ -70,11 +70,11 @@ class Config( configfile.ConfigFile ):
|
||||
@@ -77,11 +77,11 @@ class Config( configfile.ConfigFileWithProfiles ):
|
||||
configfile.ConfigFileWithProfiles.__init__( self, _('Main profile') )
|
||||
|
||||
def __init__( self ):
|
||||
self._APP_PATH = os.path.dirname( os.path.abspath( os.path.dirname( __file__ ) ) )
|
||||
- self._DOC_PATH = '/usr/share/doc/backintime'
|
||||
+ self._DOC_PATH = '${PREFIX}/share/doc/backintime'
|
||||
@ -24,12 +24,33 @@ $OpenBSD: patch-common_config_py,v 1.1.1.1 2010/05/04 12:53:49 ajacoutot Exp $
|
||||
|
||||
HOME_FOLDER = os.path.expanduser( '~' )
|
||||
self._LOCAL_DATA_FOLDER = os.path.join( os.getenv( 'XDG_DATA_HOME', '$HOME/.local/share' ).replace( '$HOME', HOME_FOLDER ), 'backintime' )
|
||||
@@ -466,7 +466,7 @@ class Config( configfile.ConfigFile ):
|
||||
cron_line = 'echo "@monthly {cmd}"'
|
||||
@@ -579,18 +579,6 @@ class Config( configfile.ConfigFileWithProfiles ):
|
||||
def set_run_nice_from_cron_enabled( self, value, profile_id = None ):
|
||||
self.set_profile_bool_value( 'snapshots.cron.nice', value, profile_id )
|
||||
|
||||
if len( cron_line ) > 0:
|
||||
- cmd = '/usr/bin/backintime --backup-job >/dev/null 2>&1'
|
||||
+ cmd = '${PREFIX}/bin/backintime --backup-job >/dev/null 2>&1'
|
||||
if self.is_run_nice_from_cron_enabled():
|
||||
cmd = 'nice -n 19 ' + cmd
|
||||
cron_line = cron_line.replace( '{cmd}', cmd )
|
||||
- def is_run_ionice_from_cron_enabled( self, profile_id = None ):
|
||||
- return self.get_profile_bool_value( 'snapshots.cron.ionice', True, profile_id )
|
||||
-
|
||||
- def set_run_ionice_from_cron_enabled( self, value, profile_id = None ):
|
||||
- self.set_profile_bool_value( 'snapshots.cron.ionice', value, profile_id )
|
||||
-
|
||||
- def is_run_ionice_from_user_enabled( self, profile_id = None ):
|
||||
- return self.get_profile_bool_value( 'snapshots.user_backup.ionice', False, profile_id )
|
||||
-
|
||||
- def set_run_ionice_from_user_enabled( self, value, profile_id = None ):
|
||||
- self.set_profile_bool_value( 'snapshots.user_backup.ionice', value, profile_id )
|
||||
-
|
||||
def is_no_on_battery_enabled( self, profile_id = None ):
|
||||
return self.get_profile_bool_value( 'snapshots.no_on_battery', False, profile_id )
|
||||
|
||||
@@ -809,9 +797,7 @@ class Config( configfile.ConfigFileWithProfiles ):
|
||||
cron_line = 'echo "{msg}\n0 ' + str(self.get_automatic_backup_time( profile_id ) / 100) + ' 1 * * {cmd}"'
|
||||
|
||||
if len( cron_line ) > 0:
|
||||
- cmd = "/usr/bin/backintime --profile \\\"%s\\\" --backup-job >/dev/null 2>&1" % profile_name
|
||||
- if self.is_run_ionice_from_cron_enabled():
|
||||
- cmd = 'ionice -c2 -n7 ' + cmd
|
||||
+ cmd = "${PREFIX}/bin/backintime --profile \\\"%s\\\" --backup-job >/dev/null 2>&1" % profile_name
|
||||
if self.is_run_nice_from_cron_enabled( profile_id ):
|
||||
cmd = 'nice -n 19 ' + cmd
|
||||
cron_line = cron_line.replace( '{cmd}', cmd )
|
||||
|
||||
@ -1,60 +1,42 @@
|
||||
$OpenBSD: patch-common_snapshots_py,v 1.1.1.1 2010/05/04 12:53:49 ajacoutot Exp $
|
||||
$OpenBSD: patch-common_snapshots_py,v 1.2 2010/11/05 16:39:10 ajacoutot Exp $
|
||||
|
||||
OpenBSD does not support extended attributes & ACLs.
|
||||
Needs the "--link" option from gcp(1) for incremental backups.
|
||||
|
||||
--- common/snapshots.py.orig Mon May 18 10:24:21 2009
|
||||
+++ common/snapshots.py Tue May 4 10:36:57 2010
|
||||
@@ -256,7 +256,7 @@ class Snapshots:
|
||||
|
||||
backup_suffix = '.backup.' + datetime.date.today().strftime( '%Y%m%d' )
|
||||
#cmd = "rsync -avR --copy-unsafe-links --whole-file --backup --suffix=%s --chmod=+w %s/.%s %s" % ( backup_suffix, self.get_snapshot_path_to( snapshot_id ), path, '/' )
|
||||
- cmd = "rsync -avRAXE --whole-file --backup --suffix=%s " % backup_suffix
|
||||
+ cmd = "rsync -avRE --whole-file --backup --suffix=%s " % backup_suffix
|
||||
cmd = cmd + '--chmod=+w '
|
||||
cmd = cmd + "\"%s.%s\" %s" % ( self.get_snapshot_path_to( snapshot_id ), path, '/' )
|
||||
self._execute( cmd )
|
||||
@@ -316,7 +316,7 @@ class Snapshots:
|
||||
path = self.get_snapshot_path( snapshot_id )
|
||||
cmd = "chmod -R a+rwx \"%s\"" % path
|
||||
--- common/snapshots.py.orig Sun Oct 24 21:31:26 2010
|
||||
+++ common/snapshots.py Fri Nov 5 16:11:52 2010
|
||||
@@ -507,14 +507,14 @@ class Snapshots:
|
||||
#cmd = "chmod -R u+rwx \"%s\"" % path
|
||||
cmd = "find \"%s\" -type d -exec chmod u+wx {} \\;" % path #Debian patch
|
||||
self._execute( cmd )
|
||||
- cmd = "rm -rfv \"%s\"" % path
|
||||
+ cmd = "rm -rf \"%s\"" % path
|
||||
self._execute( cmd )
|
||||
|
||||
def _get_last_snapshot_info( self ):
|
||||
@@ -608,7 +608,7 @@ class Snapshots:
|
||||
rsync_include2 = ' '.join( items2 )
|
||||
def copy_snapshot( self, snapshot_id, new_folder ):
|
||||
'''Copies a known snapshot to a new location'''
|
||||
current.path = self.get_snapshot_path( snapshot_id )
|
||||
#need to implement hardlinking to existing folder -> cp newest snapshot folder, rsync -aEAXHv --delete to this folder
|
||||
- cmd = "cp -dRl \"%s\"* \"%s\"" % ( current_path, new_folder )
|
||||
+ cmd = "gcp -dRl \"%s\"* \"%s\"" % ( current_path, new_folder )
|
||||
logger.info( '%s is copied to folder %s' %( snapshot_id, new_folder ) )
|
||||
self._execute( cmd )
|
||||
|
||||
#rsync prefix & suffix
|
||||
- rsync_prefix = 'rsync -aEAX '
|
||||
+ rsync_prefix = 'rsync -aE '
|
||||
rsync_exclude_backup_directory = " --exclude=\"%s\" --exclude=\"%s\" " % ( self.config.get_snapshots_path(), self.config._LOCAL_DATA_FOLDER )
|
||||
rsync_suffix = ' --chmod=Fa-w,D+w --whole-file --delete ' + rsync_exclude_backup_directory + rsync_include + ' ' + rsync_exclude + ' ' + rsync_include2 + ' --exclude=\"*\" / '
|
||||
@@ -1049,7 +1049,7 @@ class Snapshots:
|
||||
self._execute( "find \"%s\" -type d -exec chmod u+wx {} \\;" % prev_snapshot_path ) #Debian patch
|
||||
|
||||
@@ -653,14 +653,14 @@ class Snapshots:
|
||||
logger.info( "Create hard-links" )
|
||||
#clone snapshot
|
||||
- cmd = "cp -aRl \"%s\"* \"%s\"" % ( prev_snapshot_path, new_snapshot_path_to )
|
||||
+ cmd = "gcp -aRl \"%s\"* \"%s\"" % ( prev_snapshot_path, new_snapshot_path_to )
|
||||
self.append_to_take_snapshot_log( '[I] ' + cmd, 3 )
|
||||
cmd_ret_val = self._execute( cmd )
|
||||
self.append_to_take_snapshot_log( "[I] returns: %s" % cmd_ret_val, 3 )
|
||||
@@ -1098,7 +1098,7 @@ class Snapshots:
|
||||
#backup config file
|
||||
logger.info( 'Save config file' )
|
||||
self.set_take_snapshot_message( 0, _('Save config file ...') )
|
||||
- self._execute( 'cp %s %s' % (self.config._LOCAL_CONFIG_PATH, new_snapshot_path_to + '..') )
|
||||
+ self._execute( 'gcp %s %s' % (self.config._LOCAL_CONFIG_PATH, new_snapshot_path_to + '..') )
|
||||
|
||||
if force or len( ignore_folders ) == 0:
|
||||
- cmd = "cp -al \"%s\"* \"%s\"" % ( self.get_snapshot_path_to( prev_snapshot_id ), new_snapshot_path_to )
|
||||
+ cmd = "gcp -al \"%s\"* \"%s\"" % ( self.get_snapshot_path_to( prev_snapshot_id ), new_snapshot_path_to )
|
||||
self._execute( cmd )
|
||||
else:
|
||||
for folder in include_folders:
|
||||
prev_path = self.get_snapshot_path_to( prev_snapshot_id, folder )
|
||||
new_path = self.get_snapshot_path_to( new_snapshot_id, folder )
|
||||
tools.make_dirs( new_path )
|
||||
- cmd = "cp -alb \"%s\"* \"%s\"" % ( prev_path, new_path )
|
||||
+ cmd = "gcp -alb \"%s\"* \"%s\"" % ( prev_path, new_path )
|
||||
self._execute( cmd )
|
||||
else:
|
||||
if not self._create_directory( new_snapshot_path_to ):
|
||||
@@ -695,7 +695,7 @@ class Snapshots:
|
||||
prev_path = self.get_snapshot_path_to( prev_snapshot_id, folder )
|
||||
new_path = self.get_snapshot_path_to( new_snapshot_id, folder )
|
||||
tools.make_dirs( new_path )
|
||||
- cmd = "cp -alb \"%s/\"* \"%s\"" % ( prev_path, new_path )
|
||||
+ cmd = "gcp -alb \"%s/\"* \"%s\"" % ( prev_path, new_path )
|
||||
self._execute( cmd )
|
||||
|
||||
if len( prev_fileinfo_dict ) > 0:
|
||||
#save permissions for sync folders
|
||||
logger.info( 'Save permissions' )
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-common_tools_py,v 1.1.1.1 2010/05/04 12:53:49 ajacoutot Exp $
|
||||
--- common/tools.py.orig Tue May 4 11:47:10 2010
|
||||
+++ common/tools.py Tue May 4 11:47:34 2010
|
||||
@@ -103,7 +103,7 @@ def make_dirs( path ):
|
||||
$OpenBSD: patch-common_tools_py,v 1.2 2010/11/05 16:39:10 ajacoutot Exp $
|
||||
--- common/tools.py.orig Tue Oct 26 22:33:06 2010
|
||||
+++ common/tools.py Fri Nov 5 16:07:00 2010
|
||||
@@ -111,7 +111,7 @@ def make_dirs( path ):
|
||||
|
||||
|
||||
def process_exists( name ):
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2010/05/04 12:53:49 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2010/11/05 16:39:10 ajacoutot Exp $
|
||||
bin/backintime
|
||||
@man man/man1/backintime.1
|
||||
share/backintime/
|
||||
@ -15,6 +15,7 @@ share/backintime/common/snapshots.py
|
||||
share/backintime/common/tools.py
|
||||
share/backintime/plugins/
|
||||
share/backintime/plugins/usercallbackplugin.py
|
||||
share/backintime/plugins/userscriptsplugin.py
|
||||
share/doc/backintime/
|
||||
share/doc/backintime/AUTHORS
|
||||
share/doc/backintime/LICENSE
|
||||
@ -23,38 +24,57 @@ share/locale/ar/
|
||||
share/locale/ar/LC_MESSAGES/
|
||||
share/locale/ar/LC_MESSAGES/backintime.mo
|
||||
share/locale/bg/LC_MESSAGES/backintime.mo
|
||||
share/locale/bs/
|
||||
share/locale/bs/LC_MESSAGES/
|
||||
share/locale/bs/LC_MESSAGES/backintime.mo
|
||||
share/locale/ca/LC_MESSAGES/backintime.mo
|
||||
share/locale/cs/LC_MESSAGES/backintime.mo
|
||||
share/locale/da/LC_MESSAGES/backintime.mo
|
||||
share/locale/de/LC_MESSAGES/backintime.mo
|
||||
share/locale/el/LC_MESSAGES/backintime.mo
|
||||
share/locale/en_CA/
|
||||
share/locale/en_CA/LC_MESSAGES/
|
||||
share/locale/en_CA/LC_MESSAGES/backintime.mo
|
||||
share/locale/en_GB/
|
||||
share/locale/en_GB/LC_MESSAGES/
|
||||
share/locale/en_GB/LC_MESSAGES/backintime.mo
|
||||
share/locale/es/LC_MESSAGES/backintime.mo
|
||||
share/locale/et/LC_MESSAGES/backintime.mo
|
||||
share/locale/eu/LC_MESSAGES/backintime.mo
|
||||
share/locale/fi/LC_MESSAGES/backintime.mo
|
||||
share/locale/fo/
|
||||
share/locale/fo/LC_MESSAGES/
|
||||
share/locale/fo/LC_MESSAGES/backintime.mo
|
||||
share/locale/fr/LC_MESSAGES/backintime.mo
|
||||
share/locale/gl/LC_MESSAGES/backintime.mo
|
||||
share/locale/he/LC_MESSAGES/backintime.mo
|
||||
share/locale/hu/LC_MESSAGES/backintime.mo
|
||||
share/locale/id/LC_MESSAGES/backintime.mo
|
||||
share/locale/it/LC_MESSAGES/backintime.mo
|
||||
share/locale/ja/LC_MESSAGES/backintime.mo
|
||||
share/locale/jv/
|
||||
share/locale/jv/LC_MESSAGES/
|
||||
share/locale/jv/LC_MESSAGES/backintime.mo
|
||||
share/locale/ko/LC_MESSAGES/backintime.mo
|
||||
share/locale/lt/
|
||||
share/locale/lt/LC_MESSAGES/
|
||||
share/locale/lt/LC_MESSAGES/backintime.mo
|
||||
share/locale/nb/LC_MESSAGES/backintime.mo
|
||||
share/locale/nl/LC_MESSAGES/backintime.mo
|
||||
share/locale/nn/LC_MESSAGES/backintime.mo
|
||||
share/locale/pl/LC_MESSAGES/backintime.mo
|
||||
share/locale/pt/LC_MESSAGES/backintime.mo
|
||||
share/locale/pt_BR/LC_MESSAGES/backintime.mo
|
||||
share/locale/ro/LC_MESSAGES/backintime.mo
|
||||
share/locale/ru/LC_MESSAGES/backintime.mo
|
||||
share/locale/sk/LC_MESSAGES/backintime.mo
|
||||
share/locale/sl/LC_MESSAGES/backintime.mo
|
||||
share/locale/sr/LC_MESSAGES/backintime.mo
|
||||
share/locale/sv/LC_MESSAGES/backintime.mo
|
||||
share/locale/th/
|
||||
share/locale/th/LC_MESSAGES/
|
||||
share/locale/th/LC_MESSAGES/backintime.mo
|
||||
share/locale/tr/LC_MESSAGES/backintime.mo
|
||||
share/locale/uk/LC_MESSAGES/backintime.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/backintime.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/backintime.mo
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.2 2010/10/19 07:43:00 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.3 2010/11/05 16:39:10 ajacoutot Exp $
|
||||
|
||||
COMMENT= simple backup tool -- GNOME UI
|
||||
|
||||
@ -17,7 +17,6 @@ RUN_DEPENDS= ::sysutils/backintime/common \
|
||||
::textproc/meld \
|
||||
::x11/gnome/py-gnome \
|
||||
::devel/py-notify \
|
||||
:yelp-*:x11/gnome/yelp \
|
||||
:desktop-file-utils-*:devel/desktop-file-utils
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (backintime-0.9.26_src.tar.gz) = ilPR91fM+kOXVPSoucs+SQ==
|
||||
RMD160 (backintime-0.9.26_src.tar.gz) = notr5lsEWzMNV1HW5SSo1V1P29I=
|
||||
SHA1 (backintime-0.9.26_src.tar.gz) = PaR3sPqp70Z1Z278PNmQCq1ffXY=
|
||||
SHA256 (backintime-0.9.26_src.tar.gz) = zoHW7pks4Nvb4nQJ8FVCFWOr5osi1mw2JRswV+kZqX0=
|
||||
SIZE (backintime-0.9.26_src.tar.gz) = 872171
|
||||
MD5 (backintime-1.0.4_src.tar.gz) = rJ/QeLaXggu3BkO6s9obUw==
|
||||
RMD160 (backintime-1.0.4_src.tar.gz) = Cl3nbvdJKxMX6ACL1WG1vTvE9TM=
|
||||
SHA1 (backintime-1.0.4_src.tar.gz) = Ea0hwJyHskO3fQ00q1GeMARaRu4=
|
||||
SHA256 (backintime-1.0.4_src.tar.gz) = ihrchLSYbAqv1NlfYAkYQ+Quh/VhoW6Vc4MAznSdlwk=
|
||||
SIZE (backintime-1.0.4_src.tar.gz) = 226963
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-gnome_backintime-gnome,v 1.1.1.1 2010/05/04 12:53:49 ajacoutot Exp $
|
||||
--- gnome/backintime-gnome.orig Tue May 4 10:14:18 2010
|
||||
+++ gnome/backintime-gnome Tue May 4 10:14:33 2010
|
||||
$OpenBSD: patch-gnome_backintime-gnome,v 1.2 2010/11/05 16:39:10 ajacoutot Exp $
|
||||
--- gnome/backintime-gnome.orig Sun Jul 4 14:30:19 2010
|
||||
+++ gnome/backintime-gnome Fri Nov 5 16:14:06 2010
|
||||
@@ -20,8 +20,8 @@
|
||||
if [ -f app.py ]; then
|
||||
APP_PATH="."
|
||||
@ -9,6 +9,6 @@ $OpenBSD: patch-gnome_backintime-gnome,v 1.1.1.1 2010/05/04 12:53:49 ajacoutot E
|
||||
+ APP_PATH="${PREFIX}/share/backintime/gnome"
|
||||
fi
|
||||
|
||||
-python ${APP_PATH}/app.py $*
|
||||
-python ${APP_PATH}/app.py "$@"
|
||||
+${MODPY_BIN} ${APP_PATH}/app.py $*
|
||||
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
$OpenBSD: patch-gnome_plugins_gnomeplugin_py,v 1.1 2010/11/05 16:39:10 ajacoutot Exp $
|
||||
|
||||
GError: 0 is not a valid notification ID
|
||||
|
||||
--- gnome/plugins/gnomeplugin.py.orig Fri Nov 5 17:10:07 2010
|
||||
+++ gnome/plugins/gnomeplugin.py Fri Nov 5 17:13:01 2010
|
||||
@@ -24,6 +24,11 @@ import threading
|
||||
import time
|
||||
import gettext
|
||||
|
||||
+try:
|
||||
+ import glib
|
||||
+except ImportError:
|
||||
+ import gobject as glib
|
||||
+
|
||||
_=gettext.gettext
|
||||
|
||||
if len( os.getenv( 'DISPLAY', '' ) ) == 0:
|
||||
@@ -147,7 +152,11 @@ class GnomePlugin( pluginmanager.Plugin ):
|
||||
status_icon.set_visible( False )
|
||||
gtk.main_iteration( False )
|
||||
|
||||
- self.notification.close()
|
||||
+ try:
|
||||
+ self.notification.close()
|
||||
+ except glib.GError:
|
||||
+ pass # Ignore error thrown when there's no message to close
|
||||
+
|
||||
pynotify.uninit()
|
||||
|
||||
logger.info( '[GnomePlugin.Systray.run] end loop' )
|
||||
@ -0,0 +1,36 @@
|
||||
$OpenBSD: patch-gnome_settingsdialog_glade,v 1.1 2010/11/05 16:39:10 ajacoutot Exp $
|
||||
--- gnome/settingsdialog.glade.orig Fri Nov 5 16:21:05 2010
|
||||
+++ gnome/settingsdialog.glade Fri Nov 5 16:21:20 2010
|
||||
@@ -922,32 +922,6 @@
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
- <object class="GtkCheckButton" id="cb_run_ionice_from_cron">
|
||||
- <property name="label" translatable="yes">Run 'ionice' as cron job (default: enabled)</property>
|
||||
- <property name="visible">True</property>
|
||||
- <property name="can_focus">True</property>
|
||||
- <property name="receives_default">False</property>
|
||||
- <property name="draw_indicator">True</property>
|
||||
- </object>
|
||||
- <packing>
|
||||
- <property name="expand">False</property>
|
||||
- <property name="position">2</property>
|
||||
- </packing>
|
||||
- </child>
|
||||
- <child>
|
||||
- <object class="GtkCheckButton" id="cb_run_ionice_from_user">
|
||||
- <property name="label" translatable="yes">Run 'ionice' when tacking a manual snapshot (default: disabled)</property>
|
||||
- <property name="visible">True</property>
|
||||
- <property name="can_focus">True</property>
|
||||
- <property name="receives_default">False</property>
|
||||
- <property name="draw_indicator">True</property>
|
||||
- </object>
|
||||
- <packing>
|
||||
- <property name="expand">False</property>
|
||||
- <property name="position">3</property>
|
||||
- </packing>
|
||||
- </child>
|
||||
- <child>
|
||||
<object class="GtkCheckButton" id="cb_preserve_acl">
|
||||
<property name="label" translatable="yes">Preserve ACL</property>
|
||||
<property name="visible">True</property>
|
||||
@ -0,0 +1,34 @@
|
||||
$OpenBSD: patch-gnome_settingsdialog_py,v 1.1 2010/11/05 16:39:11 ajacoutot Exp $
|
||||
--- gnome/settingsdialog.py.orig Fri Nov 5 16:20:36 2010
|
||||
+++ gnome/settingsdialog.py Fri Nov 5 16:20:58 2010
|
||||
@@ -267,8 +267,6 @@ class SettingsDialog(object):
|
||||
|
||||
#nice & ionice
|
||||
self.cb_run_nice_from_cron = get('cb_run_nice_from_cron')
|
||||
- self.cb_run_ionice_from_cron = get('cb_run_ionice_from_cron')
|
||||
- self.cb_run_ionice_from_user = get('cb_run_ionice_from_user')
|
||||
self.cb_preserve_acl = get('cb_preserve_acl')
|
||||
self.cb_preserve_xattr = get('cb_preserve_xattr')
|
||||
self.cb_copy_unsafe_links = get('cb_copy_unsafe_links')
|
||||
@@ -489,12 +487,6 @@ class SettingsDialog(object):
|
||||
#run 'nice' from cron
|
||||
self.cb_run_nice_from_cron.set_active(self.config.is_run_nice_from_cron_enabled( self.profile_id ))
|
||||
|
||||
- #run 'ionice' from cron
|
||||
- self.cb_run_ionice_from_cron.set_active(self.config.is_run_ionice_from_cron_enabled( self.profile_id ))
|
||||
-
|
||||
- #run 'ionice' from user
|
||||
- self.cb_run_ionice_from_user.set_active(self.config.is_run_ionice_from_user_enabled( self.profile_id ))
|
||||
-
|
||||
#don't run when on battery
|
||||
self.cb_no_on_battery.set_active( self.config.is_no_on_battery_enabled( self.profile_id ) )
|
||||
|
||||
@@ -575,8 +567,6 @@ class SettingsDialog(object):
|
||||
#expert options
|
||||
#self.config.set_per_directory_schedule( self.cb_per_directory_schedule.get_active() )
|
||||
self.config.set_run_nice_from_cron_enabled( self.cb_run_nice_from_cron.get_active(), self.profile_id )
|
||||
- self.config.set_run_ionice_from_cron_enabled( self.cb_run_ionice_from_cron.get_active(), self.profile_id )
|
||||
- self.config.set_run_ionice_from_user_enabled( self.cb_run_ionice_from_user.get_active(), self.profile_id )
|
||||
self.config.set_no_on_battery_enabled( self.cb_no_on_battery.get_active(), self.profile_id )
|
||||
|
||||
self.config.set_preserve_acl( self.cb_preserve_acl.get_active(), self.profile_id )
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2010/05/04 12:53:49 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2010/11/05 16:39:11 ajacoutot Exp $
|
||||
bin/backintime-gnome
|
||||
@man man/man1/backintime-gnome.1
|
||||
share/applications/backintime-gnome.desktop
|
||||
@ -7,6 +7,8 @@ share/backintime/gnome/app.py
|
||||
share/backintime/gnome/clipboardtools.py
|
||||
share/backintime/gnome/fileicons.py
|
||||
share/backintime/gnome/gnometools.py
|
||||
share/backintime/gnome/logviewdialog.glade
|
||||
share/backintime/gnome/logviewdialog.py
|
||||
share/backintime/gnome/mainwindow.glade
|
||||
share/backintime/gnome/messagebox.py
|
||||
share/backintime/gnome/settingsdialog.glade
|
||||
@ -15,26 +17,12 @@ share/backintime/gnome/snapshotsdialog.glade
|
||||
share/backintime/gnome/snapshotsdialog.py
|
||||
share/backintime/gnome/textinputdialog.glade
|
||||
share/backintime/plugins/gnomeplugin.py
|
||||
share/gnome/help/backintime/
|
||||
share/gnome/help/backintime/C/
|
||||
share/gnome/help/backintime/C/backintime.xml
|
||||
share/gnome/help/backintime/C/figures/
|
||||
share/gnome/help/backintime/C/figures/mainwindow.png
|
||||
share/gnome/help/backintime/C/figures/nautilus_actions_step1.png
|
||||
share/gnome/help/backintime/C/figures/nautilus_actions_step2.png
|
||||
share/gnome/help/backintime/C/figures/nautilus_actions_step3.png
|
||||
share/gnome/help/backintime/C/figures/nautilus_actions_step4.png
|
||||
share/gnome/help/backintime/C/figures/nautilus_actions_step5.png
|
||||
share/gnome/help/backintime/C/figures/settings_auto_remove.png
|
||||
share/gnome/help/backintime/C/figures/settings_exclude.png
|
||||
share/gnome/help/backintime/C/figures/settings_expert_options.png
|
||||
share/gnome/help/backintime/C/figures/settings_general.png
|
||||
share/gnome/help/backintime/C/figures/settings_include.png
|
||||
share/gnome/help/backintime/C/figures/settings_include2.png
|
||||
share/gnome/help/backintime/C/figures/settings_options.png
|
||||
share/gnome/help/backintime/C/figures/snapshotsdialog.png
|
||||
share/gnome/help/backintime/C/legal.xml
|
||||
share/omf/backintime/
|
||||
share/omf/backintime/backintime-C.omf
|
||||
@comment share/gnome/help/backintime/
|
||||
@comment share/gnome/help/backintime/C/
|
||||
@comment share/gnome/help/backintime/C/backintime.xml
|
||||
@comment share/gnome/help/backintime/C/figures/
|
||||
@comment share/gnome/help/backintime/C/legal.xml
|
||||
@comment share/omf/backintime/
|
||||
@comment share/omf/backintime/backintime-C.omf
|
||||
@exec %D/bin/update-desktop-database
|
||||
@unexec-delete %D/bin/update-desktop-database
|
||||
|
||||
Loading…
Reference in New Issue
Block a user