changes

diff --git a/package/zypper.changes b/package/zypper.changes
index 79821bb..3dab3bd 100644 (file)
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,17 @@
 -------------------------------------------------------------------
+Thu Sep 25 14:11:16 CEST 2008 - jkupec@suse.cz
+
+- minimized RepoManager initializaiton, reduced logging drastically
+- r11162
+
+-------------------------------------------------------------------
+Thu Sep 25 00:20:16 CEST 2008 - jkupec@suse.cz
+
+- adapt to libzypp's keyring changes, trust and import dialogs
+  merged to one (bnc #366467)
+- r11162
+
+-------------------------------------------------------------------
 Fri Sep 19 23:10:46 CEST 2008 - jkupec@suse.cz
 
 - 'versioncmp' now uses zypp::Edition::compare() by default and

diff --git a/src/output/prompt.h b/src/output/prompt.h
index d735b3a..316022d 100644 (file)
--- a/src/output/prompt.h
+++ b/src/output/prompt.h
@@ -36,7 +36,7 @@ typedef enum
   PROMPT_YN_MEDIA_CHANGE                 =  9,
   PROMPT_YN_LICENSE_AGREE                = 10,
   PROMPT_YN_GPG_UNSIGNED_FILE_ACCEPT     = 11,
-  PROMPT_YN_GPG_KEY_IMPORT_TRUSTED       = 12,
+//  PROMPT_YN_GPG_KEY_IMPORT_TRUSTED       = 12,
   PROMPT_YN_GPG_UNKNOWN_KEY_ACCEPT       = 13,
   PROMPT_YN_GPG_KEY_TRUST                = 14,
   PROMPT_YN_GPG_CHECK_FAILED_IGNORE      = 15,