From 3007c252a2d715a39080435b5ade74718cd0fa71 Mon Sep 17 00:00:00 2001 From: Marcus Huewe Date: Tue, 17 May 2011 16:09:09 +0200 Subject: [PATCH] Revert "read_filemeta: create the default _files if not exists" This reverts commit a05a2a0a4f8f84cc9d92208e232a6e0e99438691. Conflicts: osc/core.py The commit doesn't make much sense because we can't recover from a missing .osc/_files file. This has to be fixed. --- osc/core.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/osc/core.py b/osc/core.py index c0cc0cda..71f5abf1 100644 --- a/osc/core.py +++ b/osc/core.py @@ -2757,21 +2757,17 @@ def filedir_to_pac(f, progress_obj=None): def read_filemeta(dir): global store - msg = '\'%s\' is not a valid working copy.\n' % dir + msg = '\'%s\' is not a valid working copy.' % dir + filesmeta = os.path.join(dir, store, '_files') if not is_package_dir(dir): raise oscerr.NoWorkingCopy(msg) - - filesmeta = os.path.join(dir, store, '_files') if not os.path.isfile(filesmeta): - print >>sys.stderr, "Warning: file _files is missing, creating a default one" - store_write_string(os.path.join(dir, store), '_files', '') + raise oscerr.NoWorkingCopy('%s (%s does not exist)' % (msg, filesmeta)) try: r = ET.parse(filesmeta) except SyntaxError, e: - raise oscerr.NoWorkingCopy(msg + - 'When parsing .osc/_files, the following error was encountered:\n' - '%s' % (dir, e)) + raise oscerr.NoWorkingCopy('%s\nWhen parsing .osc/_files, the following error was encountered:\n%s' % (msg, e)) return r def store_readlist(dir, name):